diff options
author | cyberta <cyberta@riseup.net> | 2020-12-28 14:11:55 -0800 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2020-12-28 14:11:55 -0800 |
commit | f2056a9f469c09f9d2deaad25c4a9b71275e5140 (patch) | |
tree | 60a0053cfea3fbbfa24a168bba784f541c4e093c /app/src/main/java/se/leap/bitmaskclient/StartActivity.java | |
parent | 3485971b9fc2e4602f7f4482b4b3a44e9e683efa (diff) | |
parent | 13a495d18917f9b8952088b4a3e960239c5a168c (diff) |
Merge branch 'automatic_updates_for_web_apks' into 'master'
Automatic updates for web apks
Closes #8960
See merge request leap/bitmask_android!115
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/StartActivity.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/StartActivity.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/StartActivity.java b/app/src/main/java/se/leap/bitmaskclient/StartActivity.java index 9937eeeb..1a679b1c 100644 --- a/app/src/main/java/se/leap/bitmaskclient/StartActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/StartActivity.java @@ -133,9 +133,6 @@ public class StartActivity extends Activity{ * execute necessary upgrades for version change */ private void executeUpgrade() { - if (hasNewFeature(FeatureVersionCode.MULTIPLE_PROFILES)) { - // TODO prepare usage of multiple profiles - } if (hasNewFeature(FeatureVersionCode.RENAMED_EIP_IN_PREFERENCES)) { String eipJson = preferences.getString(PROVIDER_KEY, null); if (eipJson != null) { @@ -183,9 +180,14 @@ public class StartActivity extends Activity{ if (getIntent() != null && getIntent().getBooleanExtra(EIP_RESTART_ON_BOOT, false)) { EipCommand.startVPN(this.getApplicationContext(), true); finish(); - return; + } else if (PreferenceHelper.getRestartOnUpdate(this.getApplicationContext())) { + PreferenceHelper.restartOnUpdate(this.getApplicationContext(), false); + EipCommand.startVPN(this.getApplicationContext(), false); + showMainActivity(); + finish(); + } else { + showMainActivity(); } - showMainActivity(); } } else { configureLeapProvider(); |