commit 3ac5a7018bd293b7b357dabce0b48b102a5c2f4c Author: Benjamin Erhart <berhart@netzarchitekten.com> Date: Thu Apr 30 15:29:20 2020 +0200 Issue #309: Activate newly required bridges, fixed accidental reset through Tor status notification. --- .../java/org/torproject/android/ui/onboarding/MoatActivity.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java index 697ca032..89a20eec 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java @@ -309,6 +309,8 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe Prefs.setBridgesList(sb.toString()); Prefs.putBridgesEnabled(true); + sendIntentToService(TorServiceConstants.CMD_SIGNAL_HUP); + mSuccess = true; setResult(RESULT_OK); finish(); @@ -381,6 +383,11 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe private void setUp(String host, int port, String status) { Log.d(MoatActivity.class.getSimpleName(), "Tor status=" + status); + // Ignore after successful bridge request. + if (mSuccess) { + return; + } + switch (status) { case TorServiceConstants.STATUS_OFF: // We need the Meek bridge.