Merge branch 'master' into #8885_testing_ProviderManager

2 files changed, 23 insertions, 3 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java
index 8096607a..c194ea99 100644
--- a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java
@@ -144,6 +144,22 @@ public class MainActivity extends AppCompatActivity implements Observer {
     }
 
     @Override
+    public void onBackPressed() {
+        FragmentManagerEnhanced fragmentManagerEnhanced = new FragmentManagerEnhanced(getSupportFragmentManager());
+        if (fragmentManagerEnhanced.findFragmentByTag(EipFragment.TAG) == null) {
+            Fragment fragment = new EipFragment();
+            Bundle bundle = new Bundle();
+            bundle.putParcelable(PROVIDER_KEY, provider);
+            fragment.setArguments(bundle);
+            fragmentManagerEnhanced.beginTransaction()
+                    .replace(R.id.container, fragment, EipFragment.TAG)
+                    .commit();
+        } else {
+            super.onBackPressed();
+        }
+    }
+
+    @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
         setIntent(intent);
@@ -155,10 +171,12 @@ public class MainActivity extends AppCompatActivity implements Observer {
             return;
         }
 
+        String fragmentTag = null;
         Fragment fragment = null;
         switch (intent.getAction()) {
             case ACTION_SHOW_VPN_FRAGMENT:
                 fragment = new EipFragment();
+                fragmentTag = EipFragment.TAG;
                 Bundle bundle = new Bundle();
                 if (intent.hasExtra(ASK_TO_CANCEL_VPN)) {
                     bundle.putBoolean(ASK_TO_CANCEL_VPN, true);
@@ -178,7 +196,7 @@ public class MainActivity extends AppCompatActivity implements Observer {
 
         if (fragment != null) {
             new FragmentManagerEnhanced(getSupportFragmentManager()).beginTransaction()
-                    .replace(R.id.container, fragment)
+                    .replace(R.id.container, fragment, fragmentTag)
                     .commit();
         }
     }
@@ -217,7 +235,7 @@ public class MainActivity extends AppCompatActivity implements Observer {
         arguments.putParcelable(PROVIDER_KEY, provider);
         fragment.setArguments(arguments);
         new FragmentManagerEnhanced(getSupportFragmentManager()).beginTransaction()
-                .replace(R.id.container, fragment)
+                .replace(R.id.container, fragment, EipFragment.TAG)
                 .commit();
     }
 
diff --git a/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java b/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java
index badc85ea..a2aebd44 100644
--- a/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java
@@ -420,10 +420,12 @@ public class NavigationDrawerFragment extends Fragment {
         // update the main content by replacing fragments
         FragmentManager fragmentManager = getFragmentManager();
         Fragment fragment = null;
+        String fragmentTag = null;
 
         if (parent == mDrawerAccountsListView) {
             mTitle = getString(R.string.vpn_fragment_title);
             fragment = new EipFragment();
+            fragmentTag = EipFragment.TAG;
             Bundle arguments = new Bundle();
             Provider currentProvider = getSavedProviderFromSharedPreferences(preferences);
             arguments.putParcelable(PROVIDER_KEY, currentProvider);
@@ -459,7 +461,7 @@ public class NavigationDrawerFragment extends Fragment {
 
         if (fragment != null) {
             fragmentManager.beginTransaction()
-                    .replace(R.id.container, fragment)
+                    .replace(R.id.container, fragment, fragmentTag)
                     .commit();
         }