From 744272dd1d43913c8112d1dedcb0b5a9023c491e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 14 Jan 2015 17:18:19 +0100
Subject: Connect if logged in after turning switch on

---
 .../main/java/se/leap/bitmaskclient/EipFragment.java | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'app/src/main/java/se/leap/bitmaskclient/EipFragment.java')

diff --git a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
index bbcaa577..b2898249 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
@@ -49,6 +49,7 @@ public class EipFragment extends Fragment implements Observer {
     private static EIPReceiver mEIPReceiver;
     private static EipStatus eip_status;
     private boolean is_starting_to_connect;
+    private boolean wants_to_connect;
 
     @Override
     public void onAttach(Activity activity) {
@@ -127,7 +128,7 @@ public class EipFragment extends Fragment implements Observer {
 	if(canStartEIP())
 	    startEipFromScratch();
 	else if(canLogInToStartEIP()) {
-	    Log.d(TAG, "Can Log In to start EIP");
+        wants_to_connect = true;
         Bundle bundle = new Bundle();
         bundle.putBoolean(IS_PENDING, true);
 	    dashboard.sessionDialog(bundle);
@@ -176,6 +177,7 @@ public class EipFragment extends Fragment implements Observer {
     }
 
     public void startEipFromScratch() {
+        wants_to_connect = false;
         is_starting_to_connect = true;
         progress_bar.setVisibility(View.VISIBLE);
 	eip_switch.setVisibility(View.VISIBLE);
@@ -205,6 +207,10 @@ public class EipFragment extends Fragment implements Observer {
 
 	eipCommand(Constants.ACTION_STOP_EIP);
     }
+
+    protected void updateEipService() {
+        eipCommand(Constants.ACTION_UPDATE_EIP_SERVICE);
+    }
 	
     /**
      * Send a command to EIP
@@ -339,7 +345,17 @@ public class EipFragment extends Fragment implements Observer {
             dashboard.downloadVpnCertificate();
 		    break;
 		}
-	    }
+	    } else if (request.equals(Constants.ACTION_UPDATE_EIP_SERVICE)) {
+            switch (resultCode) {
+                case Activity.RESULT_OK:
+                    if(wants_to_connect)
+                        startEipFromScratch();
+                    break;
+                case Activity.RESULT_CANCELED:
+                    handleNewState(eip_status);
+                    break;
+            }
+        }
 	}
     }
 
-- 
cgit v1.2.3