diff --git a/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt b/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt index c48f62a08..1cd7ff678 100644 --- a/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt +++ b/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt @@ -36,7 +36,6 @@ class IntentReceiverActivity : Activity() { suspend fun processIntent(intent: Intent) { val settings = settings() - settings.unsetOpenLinksInAPrivateTabIfNecessary() val modeDependentProcessors = if (settings.openLinksInAPrivateTab) { components.analytics.metrics.track(Event.OpenedLink(Event.OpenedLink.Mode.PRIVATE)) diff --git a/app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserSettingsFragment.kt index 018ce06e2..c8634f9cf 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserSettingsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserSettingsFragment.kt @@ -9,16 +9,13 @@ import android.os.Build import android.os.Build.VERSION.SDK_INT import android.os.Bundle import android.provider.Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS -import androidx.preference.CheckBoxPreference import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R import org.mozilla.fenix.ext.getPreferenceKey -import org.mozilla.fenix.ext.settings import org.mozilla.fenix.ext.showToolbar -import org.mozilla.fenix.utils.BrowsersCache /** * Lets the user control their default browser preferences @@ -50,15 +47,6 @@ class DefaultBrowserSettingsFragment : PreferenceFragmentCompat() { private fun updatePreferences() { findPreference(getPreferenceKey(R.string.pref_key_make_default_browser)) ?.updateSwitch() - - val settings = context!!.settings() - settings.unsetOpenLinksInAPrivateTabIfNecessary() - - findPreference(getPreferenceKey(R.string.pref_key_open_links_in_a_private_tab))?.apply { - isEnabled = BrowsersCache.all(requireContext()).isDefaultBrowser - isChecked = settings.openLinksInAPrivateTab - onPreferenceChangeListener = SharedPreferenceUpdater() - } } private fun getClickListenerForMakeDefaultBrowser(): Preference.OnPreferenceClickListener { diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt index f62d15484..dacba38ef 100644 --- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt @@ -24,11 +24,8 @@ import org.mozilla.fenix.BuildConfig import org.mozilla.fenix.Config import org.mozilla.fenix.R import org.mozilla.fenix.browser.browsingmode.BrowsingMode -import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.components.metrics.MozillaProductDetector -import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.getPreferenceKey -import org.mozilla.fenix.ext.settings import org.mozilla.fenix.settings.PhoneFeature import org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataOnQuitType import java.security.InvalidParameterException @@ -485,21 +482,6 @@ class Settings private constructor( ).apply() } - fun unsetOpenLinksInAPrivateTabIfNecessary() { - if (BrowsersCache.all(appContext).isDefaultBrowser) { - return - } - - appContext.settings().openLinksInAPrivateTab = false - appContext.components.analytics.metrics.track( - Event.PreferenceToggled( - preferenceKey = appContext.getString(R.string.pref_key_open_links_in_a_private_tab), - enabled = false, - context = appContext - ) - ) - } - private var showedPrivateModeContextualFeatureRecommender by booleanPreference( appContext.getPreferenceKey(R.string.pref_key_showed_private_mode_cfr), default = false