diff options
author | cyberta <cyberta@riseup.net> | 2021-11-25 02:27:53 +0000 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2021-11-25 02:27:53 +0000 |
commit | dcee5f2fa1dc67e5b08223db3441da8bd38e8b20 (patch) | |
tree | 7f9ecf27ea203335fddcee3085d55e0c7fe5b8cf /app/src/main/java/se/leap/bitmaskclient/providersetup | |
parent | 5a2ff7c85f13fe2e875e4ca7ec4192df0e896d01 (diff) | |
parent | 4795e984c940a7bbf1c2e2cae6e5eb1cf143ba4e (diff) |
Merge branch 'snowflake_ui' into 'master'
implement UI to enable/disable tor in settings fragment
See merge request leap/bitmask_android!146
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/providersetup')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerBase.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerBase.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerBase.java index 52046e07..808d9e75 100644 --- a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerBase.java +++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerBase.java @@ -200,7 +200,7 @@ public abstract class ProviderApiManagerBase { } try { - if (PreferenceHelper.getUseBridges(preferences)) { + if (PreferenceHelper.hasSnowflakePrefs(preferences)) { startTorProxy(); } } catch (InterruptedException | IllegalStateException e) { @@ -313,7 +313,7 @@ public abstract class ProviderApiManagerBase { protected boolean startTorProxy() throws InterruptedException, IllegalStateException, TimeoutException { if (EipStatus.getInstance().isDisconnected() && - PreferenceHelper.getUseTor(preferences) && + PreferenceHelper.getUseSnowflake(preferences) && serviceCallback.startTorService()) { waitForTorCircuits(); if (TorStatusObservable.isCancelled()) { |