Merge branch '#8878_fix_back_button_behavior' into 'master'

#8878 fix back button behavior for about and log screen

See merge request leap/bitmask_android!68

1 files changed, 3 insertions, 1 deletions

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 9256c136..e7a5e460 100644
--- a/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java
@@ -418,10 +418,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 = ConfigHelper.getSavedProviderFromSharedPreferences(preferences);
             arguments.putParcelable(PROVIDER_KEY, currentProvider);
@@ -457,7 +459,7 @@ public class NavigationDrawerFragment extends Fragment {
 
         if (fragment != null) {
             fragmentManager.beginTransaction()
-                    .replace(R.id.container, fragment)
+                    .replace(R.id.container, fragment, fragmentTag)
                     .commit();
         }