diff options
| author | cyberta <cyberta@riseup.net> | 2022-08-10 12:36:44 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2022-08-10 12:36:44 +0000 |
| commit | 5b9505dbb37d110b8c528671bbfc67f7944d2e43 (patch) | |
| tree | 659bf7bc84ee90a03fe796e452903aae433f559b /app/src/main/java/se/leap/bitmaskclient/base/StartActivity.java | |
| parent | 2603b325972b32c0c3cec8905ab6e5a56cc4c6bc (diff) | |
| parent | 7445bdd71ec3dff82459790cab082056d37e016f (diff) | |
Merge branch 'prepare_1.1.5RC2' into 'master'
Prepare 1.1.5 rc2
See merge request leap/bitmask_android!209
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 | 19 |
1 files changed, 5 insertions, 14 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 f4dbd6bd..8d11105f 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/StartActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/StartActivity.java @@ -157,21 +157,12 @@ public class StartActivity extends Activity{ } } - if (hasNewFeature(FeatureVersionCode.CALYX_PROVIDER_LILYPAD_UPDATE) && ( + 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()); - } - } - - if (hasNewFeature(FeatureVersionCode.RISEUP_PROVIDER_LILYPAD_UPDATE) && ( - getPackageName().equals("se.leap.riseupvpn") || - ProviderObservable.getInstance().getCurrentProvider().getDomain().equals("riseup.net"))) { + ProviderObservable.getInstance().getCurrentProvider().getDomain().equals("calyx.net"))) || + hasNewFeature(FeatureVersionCode.RISEUP_PROVIDER_LILYPAD_UPDATE) && ( + getPackageName().equals("se.leap.riseupvpn") || + ProviderObservable.getInstance().getCurrentProvider().getDomain().equals("riseup.net"))) { // deletion of current configured provider so that a new provider setup is triggered Provider provider = ProviderObservable.getInstance().getCurrentProvider(); if (provider != null && !provider.isDefault()) { |