From 268a7f205fa09edc145aace8bed30f75270a801f Mon Sep 17 00:00:00 2001
From: Fup Duck <fupduck@sacknagel.com>
Date: Tue, 6 Feb 2018 17:02:00 +0100
Subject: 8827 - handle switch provider correctly

* ProviderAPI no longer stores values in SharedPreferences
* use EipCommand to start / stop EIP
* update NavigationDrawer after changing provider
* use Broadcasts for ProviderAPI
* parse more properties from definition into Provider
* ProviderApi no longer uses static variables
* no more static Context in ProviderApiCommand
---
 .../java/se/leap/bitmaskclient/MainActivity.java   | 67 +++++++++++++---------
 1 file changed, 41 insertions(+), 26 deletions(-)

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

diff --git a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java
index 7629f0b7..d3865559 100644
--- a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java
@@ -5,15 +5,17 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 
 import se.leap.bitmaskclient.drawer.NavigationDrawerFragment;
-import se.leap.bitmaskclient.userstatus.SessionDialog;
+import se.leap.bitmaskclient.eip.EipCommand;
 
+import static se.leap.bitmaskclient.Constants.PROVIDER_KEY;
 import static se.leap.bitmaskclient.Constants.REQUEST_CODE_CONFIGURE_LEAP;
+import static se.leap.bitmaskclient.Constants.REQUEST_CODE_LOG_IN;
+import static se.leap.bitmaskclient.Constants.REQUEST_CODE_SWITCH_PROVIDER;
 import static se.leap.bitmaskclient.Constants.SHARED_PREFERENCES;
 
 
@@ -23,6 +25,8 @@ public class MainActivity extends AppCompatActivity {
     private static FragmentManagerEnhanced fragmentManager;
     private SharedPreferences preferences;
 
+    private NavigationDrawerFragment navigationDrawerFragment;
+
     public final static String ACTION_SHOW_VPN_FRAGMENT = "action_show_vpn_fragment";
 
     /**
@@ -33,13 +37,14 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-
         setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
 
-        NavigationDrawerFragment navigationDrawerFragment = (NavigationDrawerFragment)
+        navigationDrawerFragment = (NavigationDrawerFragment)
                 getSupportFragmentManager().findFragmentById(R.id.navigation_drawer);
 
         preferences = getSharedPreferences(SHARED_PREFERENCES, MODE_PRIVATE);
+        provider = ConfigHelper.getSavedProviderFromSharedPreferences(preferences);
+
         fragmentManager = new FragmentManagerEnhanced(getSupportFragmentManager());
         // Set up the drawer.
         navigationDrawerFragment.setUp(
@@ -49,15 +54,6 @@ public class MainActivity extends AppCompatActivity {
         handleIntentAction(getIntent());
     }
 
-    public static void sessionDialog(Bundle resultData) {
-        try {
-            FragmentTransaction transaction = fragmentManager.removePreviousFragment(SessionDialog.TAG);
-            SessionDialog.getInstance(provider, resultData).show(transaction, SessionDialog.TAG);
-        } catch (IllegalStateException e) {
-            e.printStackTrace();
-        }
-    }
-
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
@@ -70,35 +66,54 @@ public class MainActivity extends AppCompatActivity {
             return;
         }
 
-        Fragment fragment = null;
-
         switch (intent.getAction()) {
             case ACTION_SHOW_VPN_FRAGMENT:
-                fragment = new EipFragment();
+                showEipFragment();
                 break;
             default:
                 break;
         }
-
-        if (fragment != null) {
-            fragmentManager.beginTransaction()
-                    .replace(R.id.container, fragment)
-                    .commit();
-        }
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
         if (data == null) {
             return;
         }
 
-        if (requestCode == REQUEST_CODE_CONFIGURE_LEAP) {
-            if (resultCode == RESULT_OK && data.hasExtra(Provider.KEY)) {
-                Provider provider = data.getParcelableExtra(Provider.KEY);
-                ConfigHelper.storeProviderInPreferences(preferences, provider);
+        if (resultCode == RESULT_OK && data.hasExtra(Provider.KEY)) {
+            provider = data.getParcelableExtra(Provider.KEY);
+
+            if (provider == null) {
+                return;
             }
+
+            ConfigHelper.storeProviderInPreferences(preferences, provider);
+            navigationDrawerFragment.refresh();
+            switch (requestCode) {
+                case REQUEST_CODE_SWITCH_PROVIDER:
+                    EipCommand.stopVPN(this);
+                    break;
+                case REQUEST_CODE_CONFIGURE_LEAP:
+                    break;
+                case REQUEST_CODE_LOG_IN:
+                    EipCommand.startVPN(this);
+                    break;
+
+            }
+            showEipFragment();
         }
     }
 
+    private void showEipFragment() {
+        Fragment fragment = new EipFragment();
+        Bundle arguments = new Bundle();
+        arguments.putParcelable(PROVIDER_KEY, provider);
+        fragment.setArguments(arguments);
+        fragmentManager.beginTransaction()
+                .replace(R.id.container, fragment)
+                .commit();
+    }
+
 }
-- 
cgit v1.2.3