diff options
author | cyberta <cyberta@riseup.net> | 2022-07-25 20:28:41 +0000 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2022-07-25 20:28:41 +0000 |
commit | 2382b154db69a186e5fcf6600e5c4dceb11fb031 (patch) | |
tree | a067c8d670489e14514c916bddfea7c8463488dc /app/src/main/java/se/leap/bitmaskclient/base/StartActivity.java | |
parent | 541e1c135fc7a5a3a949e2cab06592250cb11102 (diff) | |
parent | ff83944dbfe81e88ee22a2d5f1618da4f97b2b50 (diff) |
Merge branch 'preshipped_provider_updates' into 'master'
Calyx Lilypad transition
Closes #9094
See merge request leap/bitmask_android!200
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/base/StartActivity.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/base/StartActivity.java | 44 |
1 files changed, 25 insertions, 19 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 1ea574ff..2ccbe514 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/StartActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/StartActivity.java @@ -89,7 +89,6 @@ public class StartActivity extends Activity{ case UPGRADE: executeUpgrade(); - // TODO show donation dialog break; } @@ -154,7 +153,19 @@ public class StartActivity extends Activity{ Provider provider = ProviderObservable.getInstance().getCurrentProvider(); if (provider != null && !provider.isDefault()) { PreferenceHelper.deleteProviderDetailsFromPreferences(preferences, provider.getDomain()); - ProviderObservable.getInstance().updateProvider(null); + ProviderObservable.getInstance().updateProvider(new Provider()); + } + } + + if (hasNewFeature(FeatureVersionCode.CALYX_PROVIDER_LILYPAD_UPDATE) && ( + getPackageName().equals("org.calyxinstitute.vpn") || + ProviderObservable.getInstance().getCurrentProvider().getDomain().equals("calyx.net"))) { + // deletion of current configured provider so that a new provider setup is triggered + Provider provider = ProviderObservable.getInstance().getCurrentProvider(); + if (provider != null && !provider.isDefault()) { + PreferenceHelper.deleteProviderDetailsFromPreferences(preferences, provider.getDomain()); + PreferenceHelper.deleteCurrentProviderDetailsFromPreferences(preferences); + ProviderObservable.getInstance().updateProvider(new Provider()); } } @@ -181,24 +192,19 @@ public class StartActivity extends Activity{ } private void prepareEIP() { - boolean providerExists = ProviderObservable.getInstance().getCurrentProvider() != null; - if (providerExists) { - Provider provider = ProviderObservable.getInstance().getCurrentProvider(); - if(!provider.isConfigured()) { - configureLeapProvider(); + Provider provider = ProviderObservable.getInstance().getCurrentProvider(); + if (provider.isConfigured()) { + Log.d(TAG, "vpn provider is configured"); + if (getIntent() != null && getIntent().getBooleanExtra(EIP_RESTART_ON_BOOT, false)) { + EipCommand.startVPN(this, true); + finish(); + } else if (PreferenceHelper.getRestartOnUpdate(this.getApplicationContext())) { + PreferenceHelper.restartOnUpdate(this.getApplicationContext(), false); + EipCommand.startVPN(this, false); + showMainActivity(); + finish(); } else { - Log.d(TAG, "vpn provider is configured"); - if (getIntent() != null && getIntent().getBooleanExtra(EIP_RESTART_ON_BOOT, false)) { - EipCommand.startVPN(this, true); - finish(); - } else if (PreferenceHelper.getRestartOnUpdate(this.getApplicationContext())) { - PreferenceHelper.restartOnUpdate(this.getApplicationContext(), false); - EipCommand.startVPN(this, false); - showMainActivity(); - finish(); - } else { - showMainActivity(); - } + showMainActivity(); } } else { configureLeapProvider(); |