ma1 pushed to branch tor-browser-140.7.0esr-15.0-1 at The Tor Project / Applications / Tor Browser
Commits:
-
2b6f6d20
by hackademix at 2026-01-26T20:50:45+01:00
3 changed files:
- mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/TorBrowserFeatures.kt
- mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
- mobile/android/fenix/app/src/main/res/values/preference_keys.xml
Changes:
| ... | ... | @@ -115,15 +115,19 @@ object TorBrowserFeatures { |
| 115 | 115 | )
|
| 116 | 116 | }
|
| 117 | 117 | /**
|
| 118 | - * Install NoScript as a user WebExtension if we have not already done so.
|
|
| 118 | + * Install NoScript if we have not done it yet for this browser version.
|
|
| 119 | 119 | * AMO signature is checked, but automatic updates still need to be enabled.
|
| 120 | 120 | */
|
| 121 | - if (!settings.noscriptInstalled) {
|
|
| 121 | + val extensionsVersion =
|
|
| 122 | + org.mozilla.geckoview.BuildConfig.MOZ_APP_VERSION + "-" +
|
|
| 123 | + org.mozilla.geckoview.BuildConfig.MOZ_APP_BUILDID + "-" +
|
|
| 124 | + org.mozilla.fenix.BuildConfig.VCS_HASH
|
|
| 125 | + if (settings.extensionsVersion != extensionsVersion) {
|
|
| 122 | 126 | installNoScript(
|
| 123 | 127 | context,
|
| 124 | 128 | runtime,
|
| 125 | 129 | onSuccess = {
|
| 126 | - settings.noscriptInstalled = true
|
|
| 130 | + settings.extensionsVersion = extensionsVersion
|
|
| 127 | 131 | logger.debug("NoScript extension was installed successfully")
|
| 128 | 132 | },
|
| 129 | 133 | onError = { throwable ->
|
| ... | ... | @@ -2151,14 +2151,9 @@ class Settings(private val appContext: Context) : PreferencesHolder { |
| 2151 | 2151 | default = false,
|
| 2152 | 2152 | )
|
| 2153 | 2153 | |
| 2154 | - var noscriptInstalled by booleanPreference(
|
|
| 2155 | - appContext.getPreferenceKey(R.string.pref_key_noscript_installed),
|
|
| 2156 | - default = false
|
|
| 2157 | - )
|
|
| 2158 | - |
|
| 2159 | - var noscriptUpdated by intPreference(
|
|
| 2160 | - appContext.getPreferenceKey(R.string.pref_key_noscript_updated),
|
|
| 2161 | - default = 0
|
|
| 2154 | + var extensionsVersion by stringPreference(
|
|
| 2155 | + appContext.getPreferenceKey(R.string.pref_key_extensions_version),
|
|
| 2156 | + default = ""
|
|
| 2162 | 2157 | )
|
| 2163 | 2158 | |
| 2164 | 2159 | var httpsEverywhereRemoved by booleanPreference(
|
| ... | ... | @@ -475,8 +475,7 @@ |
| 475 | 475 | <string name="pref_key_setup_step_theme" translatable="false">pref_key_setup_step_theme</string>
|
| 476 | 476 | <string name="pref_key_setup_step_extensions" translatable="false">pref_key_setup_step_extensions</string>
|
| 477 | 477 | |
| 478 | - <string name="pref_key_noscript_installed" translatable="false">pref_key_noscript_installed</string>
|
|
| 479 | - <string name="pref_key_noscript_updated" translatable="false">pref_key_noscript_updated</string>
|
|
| 478 | + <string name="pref_key_extensions_version" translatable="false">pref_key_extensions_version</string>
|
|
| 480 | 479 | <string name="pref_key_https_everywhere_removed" translatable="false">pref_key_https_everywhere_removed</string>
|
| 481 | 480 | |
| 482 | 481 | <!-- Security Level Settings -->
|