Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 03:39:05 +01:00
Code Issues Projects Releases Wiki Activity

Update comments about migration periods, since this isn't merged yet.

Browse Source
This commit is contained in:
akwizgran
2020-06-25 15:31:43 +01:00
parent 011d8e1df7
commit 033fd2d3b4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
View File

@@ -287,7 +287,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
bind(); 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) { private Settings migrateSettings(Settings settings) {
int network = settings.getInt(PREF_TOR_NETWORK, int network = settings.getInt(PREF_TOR_NETWORK,
PREF_TOR_NETWORK_AUTOMATIC); PREF_TOR_NETWORK_AUTOMATIC);

2
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
View File

@@ -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) { private Settings migrateTorSettings(Settings s) {
int network = s.getInt(PREF_TOR_NETWORK, PREF_TOR_NETWORK_AUTOMATIC); int network = s.getInt(PREF_TOR_NETWORK, PREF_TOR_NETWORK_AUTOMATIC);
if (network == PREF_TOR_NETWORK_NEVER) { if (network == PREF_TOR_NETWORK_NEVER) {