blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #8354 Remove unsetting open links in private if not default browser

master
mcarare 2020-02-17 13:29:09 +02:00 committed by Jeff Boek
parent ccf4722c5f
commit ae13f4b44f
3 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt
View File

@ -36,7 +36,6 @@ class IntentReceiverActivity : Activity() {
suspend fun processIntent(intent: Intent) { suspend fun processIntent(intent: Intent) {
val settings = settings() val settings = settings()
settings.unsetOpenLinksInAPrivateTabIfNecessary()
val modeDependentProcessors = if (settings.openLinksInAPrivateTab) { val modeDependentProcessors = if (settings.openLinksInAPrivateTab) {
components.analytics.metrics.track(Event.OpenedLink(Event.OpenedLink.Mode.PRIVATE)) components.analytics.metrics.track(Event.OpenedLink(Event.OpenedLink.Mode.PRIVATE))

12
app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserSettingsFragment.kt
View File

@ -9,16 +9,13 @@ import android.os.Build
import android.os.Build.VERSION.SDK_INT import android.os.Build.VERSION.SDK_INT
import android.os.Bundle import android.os.Bundle
import android.provider.Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS import android.provider.Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS
import androidx.preference.CheckBoxPreference
import androidx.preference.Preference import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceFragmentCompat
import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.BrowserDirection
import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.ext.getPreferenceKey import org.mozilla.fenix.ext.getPreferenceKey
import org.mozilla.fenix.ext.settings
import org.mozilla.fenix.ext.showToolbar import org.mozilla.fenix.ext.showToolbar
import org.mozilla.fenix.utils.BrowsersCache
/** /**
* Lets the user control their default browser preferences * Lets the user control their default browser preferences
@ -50,15 +47,6 @@ class DefaultBrowserSettingsFragment : PreferenceFragmentCompat() {
private fun updatePreferences() { private fun updatePreferences() {
findPreference<DefaultBrowserPreference>(getPreferenceKey(R.string.pref_key_make_default_browser)) findPreference<DefaultBrowserPreference>(getPreferenceKey(R.string.pref_key_make_default_browser))
?.updateSwitch() ?.updateSwitch()
val settings = context!!.settings()
settings.unsetOpenLinksInAPrivateTabIfNecessary()
findPreference<CheckBoxPreference>(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 { private fun getClickListenerForMakeDefaultBrowser(): Preference.OnPreferenceClickListener {

18
app/src/main/java/org/mozilla/fenix/utils/Settings.kt
View File

@ -24,11 +24,8 @@ import org.mozilla.fenix.BuildConfig
import org.mozilla.fenix.Config import org.mozilla.fenix.Config
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.browser.browsingmode.BrowsingMode 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.components.metrics.MozillaProductDetector
import org.mozilla.fenix.ext.components
import org.mozilla.fenix.ext.getPreferenceKey import org.mozilla.fenix.ext.getPreferenceKey
import org.mozilla.fenix.ext.settings
import org.mozilla.fenix.settings.PhoneFeature import org.mozilla.fenix.settings.PhoneFeature
import org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataOnQuitType import org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataOnQuitType
import java.security.InvalidParameterException import java.security.InvalidParameterException
@ -485,21 +482,6 @@ class Settings private constructor(
).apply() ).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( private var showedPrivateModeContextualFeatureRecommender by booleanPreference(
appContext.getPreferenceKey(R.string.pref_key_showed_private_mode_cfr), appContext.getPreferenceKey(R.string.pref_key_showed_private_mode_cfr),
default = false default = false