From 217d57de62c2cae22433d2b8fd17669f6bf8d5fa Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 10 May 2023 13:57:17 -0300
Subject: [PATCH] remove two lines
---
.../briarproject/mailbox/android/ui/settings/SettingsFragment.kt | 1 -
.../org/briarproject/mailbox/core/tor/AbstractTorPlugin.java | 1 -
2 files changed, 2 deletions(-)
diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/settings/SettingsFragment.kt b/mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/settings/SettingsFragment.kt
index 61d5d4a0..8f773c76 100644
--- a/mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/settings/SettingsFragment.kt
+++ b/mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/settings/SettingsFragment.kt
@@ -115,7 +115,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
} else {
circumventionProvider.getSuitableBridgeTypes(country)
}
- circumventionProvider.getSuitableBridgeTypes(country)
snowflakePref.isChecked = autoTypes.contains(SNOWFLAKE)
meekPref.isChecked = autoTypes.contains(MEEK)
obfs4Pref.isChecked = autoTypes.contains(NON_DEFAULT_OBFS4)
diff --git a/mailbox-core/src/main/java/org/briarproject/mailbox/core/tor/AbstractTorPlugin.java b/mailbox-core/src/main/java/org/briarproject/mailbox/core/tor/AbstractTorPlugin.java
index 1390882e..ca56fadc 100644
--- a/mailbox-core/src/main/java/org/briarproject/mailbox/core/tor/AbstractTorPlugin.java
+++ b/mailbox-core/src/main/java/org/briarproject/mailbox/core/tor/AbstractTorPlugin.java
@@ -263,7 +263,6 @@ public abstract class AbstractTorPlugin implements TorPlugin, EventListener {
logException(LOG, e, "Error while retrieving settings");
settings = new Settings();
}
- // TODO reset actual plugin state, if this causes us to lose conn
updateConnectionStatus(networkManager.getNetworkStatus());
});
}
--
GitLab