From 8a7c7fd06f16c9610b056e971f467de6b91af2ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Hentzschel?= <kontakt@agenedia.com>
Date: Mon, 27 Jan 2020 17:44:28 +0100
Subject: [PATCH] =?UTF-8?q?For=20#7730=20-=20always=20show=20"Add=20privat?=
 =?UTF-8?q?e=20browsing=20shortcut"=20in=20sett=E2=80=A6=20(#7943)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PrivateShortcutCreateManager.kt   | 16 +---------------
 .../java/org/mozilla/fenix/home/HomeFragment.kt  |  3 +--
 .../mozilla/fenix/settings/SettingsFragment.kt   |  5 -----
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/PrivateShortcutCreateManager.kt b/app/src/main/java/org/mozilla/fenix/components/PrivateShortcutCreateManager.kt
index 6173bf0ed..67595e204 100644
--- a/app/src/main/java/org/mozilla/fenix/components/PrivateShortcutCreateManager.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/PrivateShortcutCreateManager.kt
@@ -14,26 +14,12 @@ import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.home.intent.StartSearchIntentProcessor
 import java.util.UUID
-import android.content.pm.ShortcutManager
-import android.os.Build
-import android.os.Build.VERSION.SDK_INT
 
 /**
- * Handles the creation and existence of pinned shortcuts.
+ * Handles the creation of pinned shortcuts.
  */
 object PrivateShortcutCreateManager {
 
-    fun doesPrivateBrowsingPinnedShortcutExist(context: Context): Boolean {
-        return if (SDK_INT >= Build.VERSION_CODES.N_MR1) {
-            val pinnedShortcuts = context.getSystemService(ShortcutManager::class.java).pinnedShortcuts
-            pinnedShortcuts.any {
-                it.intent?.extras?.getString(HomeActivity.OPEN_TO_SEARCH) ==
-                StartSearchIntentProcessor.PRIVATE_BROWSING_PINNED_SHORTCUT
-            }
-        } else
-            false
-    }
-
     fun createPrivateShortcut(context: Context) {
         if (!ShortcutManagerCompat.isRequestPinShortcutSupported(context)) return
 
diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index a60ce6f6c..707654108 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -340,8 +340,7 @@ class HomeFragment : Fragment() {
         }, owner = this)
 
         if (context.settings().showPrivateModeContextualFeatureRecommender &&
-            browsingModeManager.mode.isPrivate &&
-            !PrivateShortcutCreateManager.doesPrivateBrowsingPinnedShortcutExist(context)) {
+            browsingModeManager.mode.isPrivate) {
             recommendPrivateBrowsingShortcut()
         }
 
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
index 3476a32e5..a247e0b2b 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -173,11 +173,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
             }
         }
 
-        findPreference<Preference>(getPreferenceKey(pref_key_add_private_browsing_shortcut))?.apply {
-            isVisible =
-                !PrivateShortcutCreateManager.doesPrivateBrowsingPinnedShortcutExist(context)
-        }
-
         setupPreferences()
 
         updateAccountUIState(