fenix-disable-crashpull.patch raw

   1  diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/gecko/GeckoProvider.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/gecko/GeckoProvider.kt
   2  index 12df28433480..d8e15ea79415 100644
   3  --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/gecko/GeckoProvider.kt
   4  +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/gecko/GeckoProvider.kt
   5  @@ -7,7 +7,6 @@ package org.mozilla.fenix.gecko
   6   import android.content.Context
   7   import androidx.annotation.VisibleForTesting
   8   import mozilla.components.browser.engine.gecko.autofill.GeckoAutocompleteStorageDelegate
   9  -import mozilla.components.browser.engine.gecko.crash.GeckoCrashPullDelegate
  10   import mozilla.components.browser.engine.gecko.ext.toContentBlockingSetting
  11   import mozilla.components.concept.engine.EngineSession.TrackingProtectionPolicy
  12   import mozilla.components.concept.storage.CreditCardsAddressesStorage
  13  @@ -72,6 +71,7 @@ object GeckoProvider {
  14               ),
  15           )
  16   
  17  +        /*
  18           geckoRuntime.crashPullDelegate = GeckoCrashPullDelegate(
  19               dispatcher = { crashIDs ->
  20                   context.components.appStore.dispatch(
  21  @@ -79,6 +79,7 @@ object GeckoProvider {
  22                   )
  23               },
  24           )
  25  +        */
  26   
  27           return geckoRuntime
  28       }
  29  @@ -122,7 +123,6 @@ object GeckoProvider {
  30               .extensionsProcessEnabled(true)
  31               .extensionsWebAPIEnabled(true)
  32               .translationsOfferPopup(context.settings().offerTranslation)
  33  -            .crashPullNeverShowAgain(context.settings().crashPullNeverShowAgain)
  34               .setSameDocumentNavigationOverridesLoadType(
  35                   FxNimbus.features.sameDocumentNavigationOverridesLoadType.value().enabled,
  36               )
  37  diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
  38  index 3c071edf51a4..a16994ac9a1a 100644
  39  --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
  40  +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
  41  @@ -314,7 +314,7 @@ class SecretSettingsFragment : PreferenceFragmentCompat() {
  42           }
  43   
  44           requirePreference<SwitchPreference>(R.string.pref_key_crash_pull_never_show_again).apply {
  45  -            isVisible = true
  46  +            isVisible = false
  47               isChecked = context.settings().crashPullNeverShowAgain
  48               onPreferenceChangeListener = SharedPreferenceUpdater()
  49           }
  50  diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
  51  index 35d4c5a9c0a4..0e8ff24bd1cd 100644
  52  --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
  53  +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
  54  @@ -536,10 +536,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
  55                   true,
  56               )
  57   
  58  -    var crashReportChoice by stringPreference(
  59  -        appContext.getPreferenceKey(R.string.pref_key_crash_reporting_choice),
  60  -        default = CrashReportOption.Ask.toString(),
  61  -    )
  62  +    var crashReportChoice = CrashReportOption.Never.toString()
  63   
  64       val isRemoteDebuggingEnabled by booleanPreference(
  65           appContext.getPreferenceKey(R.string.pref_key_remote_debugging),
  66  @@ -905,10 +902,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
  67        * Indicates if the user denies to ever see again the Remote Settings crash
  68        * pull UI.
  69        */
  70  -    var crashPullNeverShowAgain: Boolean by booleanPreference(
  71  -        appContext.getPreferenceKey(R.string.pref_key_crash_pull_never_show_again),
  72  -        default = false,
  73  -    )
  74  +    var crashPullNeverShowAgain: Boolean = true
  75   
  76       @VisibleForTesting
  77       internal fun timeNowInMillis(): Long = System.currentTimeMillis()
  78