Merge branch 'feature/simplify-user-session-layout-and-update-dependencies' into feature/Look-for-a-better-solution-to-the-VPN-slider-#6863

1 files changed, 5 insertions, 9 deletions

diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java
index 40a9f656..25d81da1 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java
@@ -52,20 +52,16 @@ public class VpnTestController {
     }
 
     protected FabButton getVpnWholeIcon() {
-        try {
-            View view = solo.getView(R.id.vpn_Status_Image);
-            if (view != null)
-                return (FabButton) view;
-            else
-                return null;
-        } catch (AssertionFailedError e) {
+        View view = solo.getView(R.id.vpn_Status_Image);
+        if (view != null)
+            return (FabButton) view;
+        else
             return null;
-        }
     }
 
     protected void turningEipOn() {
         assertInProgress();
-        int max_seconds_until_connected = 30;
+        int max_seconds_until_connected = 120;
 
         Condition condition = new Condition() {
             @Override