From 81505d6ec2029cde746c375f8f0dc8e256e02ab9 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Fri, 16 Feb 2018 17:23:54 +0100 Subject: #8857 fix dialog recreation in EipFragment --- .../main/java/se/leap/bitmaskclient/MainActivity.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'app/src/main/java/se/leap/bitmaskclient/MainActivity.java') diff --git a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java index 2a2a68a7..7c5ae515 100644 --- a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java @@ -197,6 +197,9 @@ public class MainActivity extends AppCompatActivity implements Observer, MainAct default: break; } + // on layout change / recreation of the activity, we don't want create new Fragments + // instead the fragments themselves care about recreation and state restoration + intent.setAction(null); if (fragment != null) { new FragmentManagerEnhanced(getSupportFragmentManager()).beginTransaction() @@ -256,6 +259,14 @@ public class MainActivity extends AppCompatActivity implements Observer, MainAct super.onDestroy(); } + + @Override + public void update(Observable observable, Object data) { + if (observable instanceof EipStatus) { + eipStatus = (EipStatus) observable; + } + } + private void setUpBroadcastReceiver() { IntentFilter updateIntentFilter = new IntentFilter(BROADCAST_EIP_EVENT); updateIntentFilter.addAction(BROADCAST_PROVIDER_API_EVENT); @@ -383,12 +394,6 @@ public class MainActivity extends AppCompatActivity implements Observer, MainAct } - @Override - public void update(Observable observable, Object data) { - if (observable instanceof EipStatus) { - eipStatus = (EipStatus) observable; - } - } private void stop() { preferences.edit().putBoolean(EIP_RESTART_ON_BOOT, false).apply(); -- cgit v1.2.3