tor-browser

commit eaf448cfd0d4b1c9068422adebde9d08405f5a5a
parent 6d0ce54a76f1f400087f3cb81802373eed7f0373
Author: hackademix <giorgio@maone.net>
Date:   Thu, 22 Jan 2026 23:06:51 +0100

fixup! [android] Modify add-on support

TB 44533: Install bundled NoScript extension at least once per build install

Diffstat:
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/TorBrowserFeatures.kt
 | 
10
+++++++---
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
 | 
11
+++--------
M
mobile/android/fenix/app/src/main/res/values/preference_keys.xml
 | 
4
++--

3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/TorBrowserFeatures.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/TorBrowserFeatures.kt
@@ -115,15 +115,19 @@ object TorBrowserFeatures {
             )
         }
         /**
-         *  Install NoScript as a user WebExtension if we have not already done so.
+         *  Install NoScript if we have not done it yet for this browser version.
          *  AMO signature is checked, but automatic updates still need to be enabled.
          */
-        if (!settings.noscriptInstalled) {
+        val extensionsVersion =
+            org.mozilla.geckoview.BuildConfig.MOZ_APP_VERSION + "-" +
+            org.mozilla.geckoview.BuildConfig.MOZ_APP_BUILDID + "-" +
+            org.mozilla.fenix.BuildConfig.VCS_HASH
+        if (settings.extensionsVersion != extensionsVersion) {
             installNoScript(
                 context,
                 runtime,
                 onSuccess = {
-                    settings.noscriptInstalled = true
+                    settings.extensionsVersion = extensionsVersion
                     logger.debug("NoScript extension was installed successfully")
                 },
                 onError = { throwable ->
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
@@ -2427,14 +2427,9 @@ class Settings(
         default = false,
     )
 
-    var noscriptInstalled by booleanPreference(
-        appContext.getPreferenceKey(R.string.pref_key_noscript_installed),
-        default = false
-    )
-
-    var noscriptUpdated by intPreference(
-        appContext.getPreferenceKey(R.string.pref_key_noscript_updated),
-        default = 0
+    var extensionsVersion by stringPreference(
+        appContext.getPreferenceKey(R.string.pref_key_extensions_version),
+        default = ""
     )
 
     var httpsEverywhereRemoved by booleanPreference(
diff --git a/mobile/android/fenix/app/src/main/res/values/preference_keys.xml b/mobile/android/fenix/app/src/main/res/values/preference_keys.xml
@@ -523,10 +523,10 @@
     <string name="pref_key_tab_manager_enhancements" translatable="false">pref_key_tab_manager_enhancements</string>
     <string name="pref_key_tab_manager_opening_animation" translatable="false">pref_key_tab_manager_opening_animation</string>
 
+
     <!-- Tab Search -->
     <string name="pref_key_tab_search" translatable="false">pref_key_tab_search_feature</string>
 
-    <string name="pref_key_noscript_installed" translatable="false">pref_key_noscript_installed</string>
-    <string name="pref_key_noscript_updated" translatable="false">pref_key_noscript_updated</string>
+    <string name="pref_key_extensions_version" translatable="false">pref_key_extensions_version</string>
     <string name="pref_key_https_everywhere_removed" translatable="false">pref_key_https_everywhere_removed</string>
 </resources>