diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-12-03 21:02:58 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-12-03 21:02:58 +0100 |
| commit | d67d127aa9691fbad10f93294c6b0b7e45406ed8 (patch) | |
| tree | 093e94bac3e070fe28ee1428b29185d068ad1c90 /app/src/main/java/se | |
| parent | b4d6003265e49e537ec3fae16740de7885864520 (diff) | |
| parent | 64c08c28dbd1b22451d990559b3f345cfcae05ba (diff) | |
Merge branch 'bug/Configuration-wizard-crashes-after-changing-orientation-#6471' into develop
Diffstat (limited to 'app/src/main/java/se')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/Dashboard.java | 3 | ||||
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/FragmentManagerEnhanced.java | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java index 8143d8d6..94de2fe8 100644 --- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java +++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java @@ -86,7 +86,6 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf preferences = getSharedPreferences(SHARED_PREFERENCES, MODE_PRIVATE); fragment_manager = new FragmentManagerEnhanced(getFragmentManager()); handleVersion(); - boolean provider_configured = preferences.getString(Constants.KEY, "").isEmpty(); if (provider_configured) startActivityForResult(new Intent(this,ConfigurationWizard.class),CONFIGURE_LEAP); @@ -136,7 +135,6 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf preferences.edit().putInt(Constants.PARSED_SERIAL, 0).apply(); preferences.edit().putBoolean(Constants.AUTHED_EIP, authed_eip).apply(); updateEipService(); - buildDashboard(false); invalidateOptionsMenu(); if(data != null && data.hasExtra(LogInDialog.TAG)) { logInDialog(Bundle.EMPTY); @@ -205,7 +203,6 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf eip_fragment.setArguments(arguments); } - fragment_manager.removePreviousFragment(EipServiceFragment.TAG); fragment_manager.replace(R.id.servicesCollection, eip_fragment, EipServiceFragment.TAG); if (hide_and_turn_on_eip) { diff --git a/app/src/main/java/se/leap/bitmaskclient/FragmentManagerEnhanced.java b/app/src/main/java/se/leap/bitmaskclient/FragmentManagerEnhanced.java index c4844be9..49af9274 100644 --- a/app/src/main/java/se/leap/bitmaskclient/FragmentManagerEnhanced.java +++ b/app/src/main/java/se/leap/bitmaskclient/FragmentManagerEnhanced.java @@ -45,6 +45,10 @@ public class FragmentManagerEnhanced { transaction.replace(containerViewId, fragment, tag).commit(); } + public FragmentTransaction beginTransaction() { + return generic_fragment_manager.beginTransaction(); + } + public Fragment findFragmentByTag(String tag) { return generic_fragment_manager.findFragmentByTag(tag); } |