Merge branch 'bugfix_branch' into 'master'

Bugfixes and more

Closes #9110

See merge request leap/bitmask_android!205

1 files changed, 12 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 2ccbe514..f4dbd6bd 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/StartActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/StartActivity.java
@@ -169,6 +169,18 @@ public class StartActivity extends Activity{
             }
         }
 
+        if (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()) {
+                PreferenceHelper.deleteProviderDetailsFromPreferences(preferences, provider.getDomain());
+                PreferenceHelper.deleteCurrentProviderDetailsFromPreferences(preferences);
+                ProviderObservable.getInstance().updateProvider(new Provider());
+            }
+        }
+
         // always check if manual gateway selection feature switch has been disabled
         if (!BuildConfig.allow_manual_gateway_selection && PreferenceHelper.getPreferredCity(this) != null) {
             PreferenceHelper.setPreferredCity(this, null);