diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java index e2494e830..e23a0da48 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java @@ -195,8 +195,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener { if (!assetsAreUpToDate()) installAssets(); if (cookieFile.exists() && !cookieFile.delete()) LOG.warning("Old auth cookie not deleted"); - // Migrate old settings before having a chance to stop - migrateSettings(); // Start a new Tor process LOG.info("Starting Tor"); String torPath = torFile.getAbsolutePath(); @@ -816,21 +814,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener { controlConnection.setConf("ConnectionPadding", enable ? "1" : "0"); } - // TODO remove when sufficient time has passed. Added 2018-08-15 - private void migrateSettings() { - Settings sOld = callback.getSettings(); - int oldNetwork = sOld.getInt("network", -1); - if (oldNetwork == -1) return; - Settings s = new Settings(); - if (oldNetwork == 0) { - s.putInt(PREF_TOR_NETWORK, PREF_TOR_NETWORK_NEVER); - } else if (oldNetwork == 1) { - s.putBoolean(PREF_TOR_MOBILE, false); - } - s.putInt("network", -1); - callback.mergeSettings(s); - } - private static class ConnectionStatus { // All of the following are locking: this