#8811 set vpn option to top of navigation drawer, minor ux improvements

1 files changed, 34 insertions, 0 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java
index 41e496bb..40a9052c 100644
--- a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java
@@ -1,7 +1,9 @@
 package se.leap.bitmaskclient;
 
 
+import android.content.Intent;
 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;
@@ -16,6 +18,7 @@ public class MainActivity extends AppCompatActivity {
     private static Provider provider = new Provider();
     private static FragmentManagerEnhanced fragmentManager;
 
+    public final static String ACTION_SHOW_VPN_FRAGMENT = "action_show_vpn_fragment";
 
     /**
      * Fragment managing the behaviors, interactions and presentation of the navigation drawer.
@@ -37,6 +40,7 @@ public class MainActivity extends AppCompatActivity {
                 R.id.navigation_drawer,
                 (DrawerLayout) findViewById(R.id.drawer_layout));
 
+        handleIntentAction(getIntent());
     }
 
     public static void sessionDialog(Bundle resultData) {
@@ -48,4 +52,34 @@ public class MainActivity extends AppCompatActivity {
         }
     }
 
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        setIntent(intent);
+        handleIntentAction(intent);
+    }
+
+    private void handleIntentAction(Intent intent) {
+        if (intent == null || intent.getAction() == null) {
+            return;
+        }
+
+        Fragment fragment = null;
+
+        switch (intent.getAction()) {
+            case ACTION_SHOW_VPN_FRAGMENT:
+                fragment = new VpnFragment();
+                break;
+            default:
+                break;
+        }
+
+        if (fragment != null) {
+            fragmentManager.beginTransaction()
+                    .replace(R.id.container, fragment)
+                    .commit();
+        }
+    }
+
+
 }