[tbb-commits] [Git][tpo/applications/tor-browser][tor-browser-115.9.0esr-13.5-1] fixup! Bug 42247: Android helpers for the TorProvider

[Pier Angelo Vendrame (@pierov)]

Pier Angelo Vendrame pushed to branch tor-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser


Commits:
c2461f1d by clairehurst at 2024-03-20T09:39:13+01:00
fixup! Bug 42247: Android helpers for the TorProvider

Moved setSettings and TorLegacyAndroidSettings.setMigrated() into a new
if block in onPostExecute() from doInBackground().

- - - - -


1 changed file:

- mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorIntegrationAndroid.java


Changes:

=====================================
mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorIntegrationAndroid.java
=====================================
@@ -181,8 +181,6 @@ public class TorIntegrationAndroid implements BundleEventListener {
             TorSettings settings;
             if (TorLegacyAndroidSettings.unmigrated()) {
                 settings = TorLegacyAndroidSettings.loadTorSettings();
-                setSettings(settings, true, true);
-                TorLegacyAndroidSettings.setMigrated();
             } else {
                 GeckoBundle bundle = message.getBundle("settings");
                 settings = new TorSettings(bundle);
@@ -193,6 +191,10 @@ public class TorIntegrationAndroid implements BundleEventListener {
         @Override
         protected void onPostExecute(TorSettings torSettings) {
             mSettings = torSettings;
+            if (TorLegacyAndroidSettings.unmigrated()) {
+                setSettings(mSettings, true, true);
+                TorLegacyAndroidSettings.setMigrated();
+            }
         }
     }
 



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c2461f1df4108997b32f06c38cea14feab31e127

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c2461f1df4108997b32f06c38cea14feab31e127
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tbb-commits/attachments/20240320/34b81f62/attachment-0001.htm>