1 files changed, 11 insertions, 6 deletions
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();