1 files changed, 5 insertions, 3 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 555eb21d..c385c4c4 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerBase.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerBase.java
@@ -191,7 +191,9 @@ public abstract class ProviderApiManagerBase {
         }
 
          try {
-            startTorProxy();
+             if (PreferenceHelper.getUseBridges(preferences)) {
+                 startTorProxy();
+             }
         } catch (InterruptedException | IllegalStateException e) {
             e.printStackTrace();
             return;
@@ -301,8 +303,8 @@ public abstract class ProviderApiManagerBase {
     }
 
     protected boolean startTorProxy() throws InterruptedException, IllegalStateException, TimeoutException {
-        if (PreferenceHelper.getUseBridges(preferences) &&
-                EipStatus.getInstance().isDisconnected() &&
+        if (EipStatus.getInstance().isDisconnected() &&
+                PreferenceHelper.getUseTor(preferences) &&
                 serviceCallback.isConnectedToWifi()
         ) {
             serviceCallback.startTorService();