[tor-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\) via tor-commits" <tor-commits@xxxxxxxxxxxxxxxxxxxx>]

Title: GitLab

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 {
181	181	TorSettings settings;
182	182	if (TorLegacyAndroidSettings.unmigrated()) {
183	183	settings = TorLegacyAndroidSettings.loadTorSettings();
184		- setSettings(settings, true, true);
185		- TorLegacyAndroidSettings.setMigrated();
186	184	} else {
187	185	GeckoBundle bundle = message.getBundle("settings");
188	186	settings = new TorSettings(bundle);
...	...	@@ -193,6 +191,10 @@ public class TorIntegrationAndroid implements BundleEventListener {
193	191	@Override
194	192	protected void onPostExecute(TorSettings torSettings) {
195	193	mSettings = torSettings;
	194	+ if (TorLegacyAndroidSettings.unmigrated()) {
	195	+ setSettings(mSettings, true, true);
	196	+ TorLegacyAndroidSettings.setMigrated();
	197	+ }
196	198	}
197	199	}
198	200

—
View it on GitLab.
You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits