tor-browser

commit 592042b39f61a9caec42d6b4bec6791673a23095
parent b5306fec84260df46ed6f792be742a3635167da8
Author: Tim Huang <tihuang@mozilla.com>
Date:   Wed, 22 Oct 2025 08:14:36 +0000

Bug 1995037 - Fix the way how we set the pref for SafeBrowsingProvider.enabled. r=ohall,geckoview-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D269450

Diffstat:
M
mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentBlockingControllerTest.kt
 | 
6
++++++
M
mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlocking.java
 | 
13
+++++++------

2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentBlockingControllerTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentBlockingControllerTest.kt
@@ -259,6 +259,7 @@ class ContentBlockingControllerTest : BaseSessionTest() {
             "browser.safebrowsing.provider.google5.updateURL",
             "browser.safebrowsing.provider.google5.gethashURL",
             "browser.safebrowsing.provider.google5.lists",
+            "browser.safebrowsing.provider.google5.enabled",
         )
 
         assertThat(
@@ -291,6 +292,11 @@ class ContentBlockingControllerTest : BaseSessionTest() {
             restoredPrefs[5] as String,
             equalTo(originalPrefs[5]),
         )
+        assertThat(
+            "Restored prefs value is correct",
+            restoredPrefs[6] as Boolean,
+            equalTo(originalPrefs[6]),
+        )
     }
 
     @Test
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlocking.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlocking.java
@@ -618,7 +618,12 @@ public class ContentBlocking {
         return false;
       }
 
-      return provider.getEnabled();
+      final Boolean enabled = provider.getEnabled();
+      if (enabled == null) {
+        return false;
+      }
+
+      return enabled;
     }
 
     /**
@@ -1519,11 +1524,7 @@ public class ContentBlocking {
       mAdvisoryName = new Pref<>(ROOT + mName + ".advisoryName", null);
       mDataSharingUrl = new Pref<>(ROOT + mName + ".dataSharingURL", null);
       mDataSharingEnabled = new Pref<>(ROOT + mName + ".dataSharing.enabled", false);
-      if (mName.equals("google5")) {
-        mEnabled = new Pref<>(ROOT + mName + ".enabled", BuildConfig.NIGHTLY_BUILD);
-      } else {
-        mEnabled = new Pref<>(ROOT + mName + ".enabled", false);
-      }
+      mEnabled = new Pref<>(ROOT + mName + ".enabled", null);
 
       if (source != null) {
         updatePrefs(source);