1 files changed, 15 insertions, 0 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/ConfigWizardBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/ConfigWizardBaseActivity.java
index 7fcb5816..ea328216 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ConfigWizardBaseActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ConfigWizardBaseActivity.java
@@ -2,6 +2,7 @@ package se.leap.bitmaskclient;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.os.PersistableBundle;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
@@ -74,6 +75,20 @@ public abstract class ConfigWizardBaseActivity extends ButterKnifeActivity {
             setProviderHeaderText(provider.getName());
     }
 
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        if (provider != null) {
+            outState.putParcelable(PROVIDER_KEY, provider);
+        }
+    }
+
+    protected void restoreState(Bundle savedInstanceState) {
+        if (savedInstanceState != null && savedInstanceState.containsKey(PROVIDER_KEY)) {
+            provider = savedInstanceState.getParcelable(PROVIDER_KEY);
+        }
+    }
+
     protected void setProviderHeaderLogo(@DrawableRes int providerHeaderLogo) {
         this.providerHeaderLogo.setImageResource(providerHeaderLogo);
     }