2 files changed, 46 insertions, 29 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderAPI.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderAPI.java
index 42ded09f..e818f587 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderAPI.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderAPI.java
@@ -37,17 +37,15 @@ import java.io.Closeable;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
+import de.blinkt.openvpn.core.NetworkUtils;
 import se.leap.bitmaskclient.base.utils.PreferenceHelper;
 import se.leap.bitmaskclient.providersetup.connectivity.OkHttpClientGenerator;
 import se.leap.bitmaskclient.tor.ClientTransportPlugin;
 import se.leap.bitmaskclient.tor.TorNotificationManager;
-import se.leap.bitmaskclient.tor.TorStatusObservable;
 
 import static se.leap.bitmaskclient.base.models.Constants.SHARED_PREFERENCES;
 import static se.leap.bitmaskclient.base.utils.ConfigHelper.ensureNotOnMainThread;
 import static se.leap.bitmaskclient.tor.TorNotificationManager.TOR_SERVICE_NOTIFICATION_ID;
-import static se.leap.bitmaskclient.tor.TorStatusObservable.TorStatus.OFF;
-import static se.leap.bitmaskclient.tor.TorStatusObservable.TorStatus.STOPPING;
 
 /**
  * Implements HTTP api methods (encapsulated in {{@link ProviderApiManager}})
@@ -151,23 +149,31 @@ public class ProviderAPI extends JobIntentService implements ProviderApiManagerB
         LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
     }
 
+    @Override
+    public boolean isConnectedToWifi() {
+        return NetworkUtils.isConnectedToWifi(getApplicationContext());
+    }
+
+    @Override
+    public void startTorService() {
+        initTorServiceConnection(this);
+        Intent torServiceIntent = new Intent(this, TorService.class);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            Notification notification = TorNotificationManager.buildTorForegroundNotification(getApplicationContext());
+            //noinspection NewApi
+            getApplicationContext().startForegroundService(torServiceIntent);
+            torServiceConnection.torService.startForeground(TOR_SERVICE_NOTIFICATION_ID, notification);
+        } else {
+            getApplicationContext().startService(torServiceIntent);
+        }
+    }
 
 
     @Override
     public int getTorHttpTunnelPort() {
         initTorServiceConnection(this);
         if (torServiceConnection != null) {
-            Intent torServiceIntent = new Intent(this, TorService.class);
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                Notification notification = TorNotificationManager.buildTorForegroundNotification(getApplicationContext());
-                //noinspection NewApi
-                getApplicationContext().startForegroundService(torServiceIntent);
-                torServiceConnection.torService.startForeground(TOR_SERVICE_NOTIFICATION_ID, notification);
-            } else {
-                getApplicationContext().startService(torServiceIntent);
-            }
-
             int tunnelPort = torServiceConnection.torService.getHttpTunnelPort();
             torServiceConnection.close();
             torServiceConnection = null;
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 9ca4c746..780ecaed 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerBase.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerBase.java
@@ -51,6 +51,8 @@ import java.util.NoSuchElementException;
 import java.util.Observer;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.net.ssl.SSLHandshakeException;
 import javax.net.ssl.SSLPeerUnverifiedException;
@@ -149,7 +151,9 @@ public abstract class ProviderApiManagerBase {
 
     public interface ProviderApiServiceCallback {
         void broadcastEvent(Intent intent);
+        void startTorService();
         int getTorHttpTunnelPort();
+        boolean isConnectedToWifi();
     }
 
     private final ProviderApiServiceCallback serviceCallback;
@@ -188,7 +192,11 @@ public abstract class ProviderApiManagerBase {
         }
 
         // uncomment for testing --v
-        TorStatusObservable.setProxyPort(startTorProxy());
+        /* try {
+            startTorProxy();
+        } catch (InterruptedException | TimeoutException e) {
+            e.printStackTrace();
+        } */
 
         Bundle result = new Bundle();
         switch (action) {
@@ -287,35 +295,38 @@ public abstract class ProviderApiManagerBase {
         }
     }
 
-    protected int startTorProxy() {
-        int port = -1;
-        if (PreferenceHelper.useTor(preferences) && EipStatus.getInstance().isDisconnected() ) {
-            port = serviceCallback.getTorHttpTunnelPort();
-            if (port != -1) {
-                try {
-                    waitForTorCircuits();
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                    port = -1;
-                }
-            }
+    protected boolean startTorProxy() throws InterruptedException, TimeoutException {
+        if (PreferenceHelper.useTor(preferences) &&
+                EipStatus.getInstance().isDisconnected() &&
+                serviceCallback.isConnectedToWifi()
+        ) {
+            serviceCallback.startTorService();
+            waitForTorCircuits();
+            int port = serviceCallback.getTorHttpTunnelPort();
+            TorStatusObservable.setProxyPort(port);
+            return port != -1;
         }
-        return port;
+        return false;
     }
 
-    private void waitForTorCircuits() throws InterruptedException {
+    private void waitForTorCircuits() throws InterruptedException, TimeoutException {
         if (TorStatusObservable.getStatus() == ON) {
             return;
         }
         CountDownLatch countDownLatch = new CountDownLatch(1);
+        AtomicBoolean successfulSetup = new AtomicBoolean(false);
         Observer observer = (o, arg) -> {
             if (TorStatusObservable.getStatus() == ON) {
+                successfulSetup.set(true);
                 countDownLatch.countDown();
             }
         };
         TorStatusObservable.getInstance().addObserver(observer);
         countDownLatch.await(180, TimeUnit.SECONDS);
         TorStatusObservable.getInstance().deleteObserver(observer);
+        if (!successfulSetup.get()) {
+            throw new TimeoutException("Timeout reached");
+        }
     }
 
     void resetProviderDetails(Provider provider) {