diff options
author | cyBerta <cyberta@riseup.net> | 2018-05-12 02:39:02 +0200 |
---|---|---|
committer | cyBerta <cyberta@riseup.net> | 2018-05-12 02:39:02 +0200 |
commit | 93d4870267455b30d10c9ce6be76465e88cc50d1 (patch) | |
tree | f36cbb3bc9003898a0714bd34c51440462a31bea /app/src/main/java/se/leap/bitmaskclient/drawer | |
parent | dcf338a665a56d28db8f001b6118d15cfdb88989 (diff) | |
parent | 5122945a6860caeb46359540ae2a1382f8aab415 (diff) |
Merge branch 'master' into #8885_testing_ProviderManager
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/drawer')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java | 4 |
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 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(); } |