1 files changed, 17 insertions, 0 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/StartActivity.java b/app/src/main/java/se/leap/bitmaskclient/base/StartActivity.java
index 58b057b7..6426c3d6 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/StartActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/StartActivity.java
@@ -103,10 +103,27 @@ public class StartActivity extends Activity{
         // initialize app necessities
         VpnStatus.initLogCache(getApplicationContext().getCacheDir());
 
+        sanitizeStartIntent();
         prepareEIP();
 
     }
 
+    private void sanitizeStartIntent() {
+        Intent intent = new Intent();
+        try {
+            if (getIntent().hasExtra(EIP_RESTART_ON_BOOT)) {
+                intent.putExtra(EIP_RESTART_ON_BOOT, getIntent().getBooleanExtra(EIP_RESTART_ON_BOOT, false));
+            }
+            if (getIntent().hasExtra(APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE)) {
+                intent.putExtra(APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE, false);
+            }
+        } catch (RuntimeException e) {
+
+        }
+        this.setIntent(intent);
+    }
+
+
     /**
      *  check if normal start, first run, up or downgrade
      *  @return @StartupMode