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()) {