From 4edff860bf3655db1ebdaa9f80265ff68dcb3c6a Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Wed, 7 Feb 2018 23:41:18 +0100
Subject: #8829 fixes notification handling after ui changes and fixes also
 memory leak #8838

---
 .../main/java/se/leap/bitmaskclient/EipFragment.java | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 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 4027bc14..c0e2c21e 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
@@ -53,6 +53,7 @@ import de.blinkt.openvpn.core.VpnStatus;
 import se.leap.bitmaskclient.eip.EIP;
 import se.leap.bitmaskclient.eip.EipStatus;
 import se.leap.bitmaskclient.eip.VoidVpnService;
+import se.leap.bitmaskclient.userstatus.SessionDialog;
 
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
@@ -73,10 +74,12 @@ import static se.leap.bitmaskclient.Constants.SHARED_PREFERENCES;
 
 public class EipFragment extends Fragment implements Observer {
 
-    public static String TAG = EipFragment.class.getSimpleName();
+    public final static String TAG = EipFragment.class.getSimpleName();
 
     protected static final String IS_CONNECTED = TAG + ".is_connected";
     public static final String START_EIP_ON_BOOT = "start on boot";
+    public static final String ASK_TO_CANCEL_VPN = "ask_to_cancel_vpn";
+
 
     private SharedPreferences preferences;
 
@@ -121,6 +124,7 @@ public class EipFragment extends Fragment implements Observer {
 
     };
 
+    @Override
     public void onAttach(Context context) {
         super.onAttach(context);
         downloadEIPServiceConfig();
@@ -141,8 +145,12 @@ public class EipFragment extends Fragment implements Observer {
         ButterKnife.inject(this, view);
 
         Bundle arguments = getArguments();
-        if (arguments != null && arguments.containsKey(START_EIP_ON_BOOT) && arguments.getBoolean(START_EIP_ON_BOOT)) {
-            startEipFromScratch();
+        if (arguments != null) {
+            if (arguments.containsKey(START_EIP_ON_BOOT) && arguments.getBoolean(START_EIP_ON_BOOT)) {
+                startEipFromScratch();
+            } else if (arguments.containsKey(ASK_TO_CANCEL_VPN) && arguments.getBoolean(ASK_TO_CANCEL_VPN)) {
+                askToStopEIP();
+            }
         }
         return view;
     }
@@ -205,8 +213,10 @@ public class EipFragment extends Fragment implements Observer {
             startEipFromScratch();
         else if (canLogInToStartEIP()) {
             wantsToConnect = true;
-            Bundle bundle = new Bundle();
-            MainActivity.sessionDialog(bundle);
+            /*Bundle bundle = new Bundle();
+            seionDialogCallback.onSessionDialog(bundle);*/
+            Log.w(TAG, "TODO: implement login from here");
+            //FIXME: implement login from here
         } else {
             Log.d(TAG, "WHAT IS GOING ON HERE?!");
             // TODO: implement a fallback: check if vpncertificate was not downloaded properly or give
-- 
cgit v1.2.3