From 033fd2d3b4af7149c5ec6830bbb60695f3d6fd41 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Thu, 25 Jun 2020 15:31:43 +0100 Subject: [PATCH] Update comments about migration periods, since this isn't merged yet. --- .../java/org/briarproject/bramble/plugin/tor/TorPlugin.java | 2 +- .../briarproject/briar/android/settings/SettingsFragment.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 66a869d0c..374f221af 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 @@ -287,7 +287,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener { bind(); } - // TODO: Remove after a reasonable migration period (added 2020-01-16) + // TODO: Remove after a reasonable migration period (added 2020-06-25) private Settings migrateSettings(Settings settings) { int network = settings.getInt(PREF_TOR_NETWORK, PREF_TOR_NETWORK_AUTOMATIC); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java index 79879580d..0c41e6fba 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java @@ -370,7 +370,7 @@ public class SettingsFragment extends PreferenceFragmentCompat }); } - // TODO: Remove after a reasonable migration period (added 2020-01-29) + // TODO: Remove after a reasonable migration period (added 2020-06-25) private Settings migrateTorSettings(Settings s) { int network = s.getInt(PREF_TOR_NETWORK, PREF_TOR_NETWORK_AUTOMATIC); if (network == PREF_TOR_NETWORK_NEVER) {