Merge branch 'prepare_1.1.5RC2' into 'master'

Prepare 1.1.5 rc2

See merge request leap/bitmask_android!209

3 files changed, 15 insertions, 16 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 6a441fac..072536f9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+1.1.5RC2 Beta
+* improvements of obfuscation proxy pinning
+* support for Android API 31 (Android S)
+* updated dependencies (ics-openvpn, OpenSSL, Asio, IPtProxy, Snowflake)
+* show option to disable blocking if the client fails to connect to any gateway of a given transport
+* disable donation page for Bitmask for now
+* fix notification not disappearing after vpn has been turned off
+
 1.1.5 Beta
 * integrate obfsvpn - a new pluggable transports library
 * pin single obfuscation proxies
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()) {
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/models/FeatureVersionCode.java b/app/src/main/java/se/leap/bitmaskclient/base/models/FeatureVersionCode.java
index 9f813415..f7251acb 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/models/FeatureVersionCode.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/models/FeatureVersionCode.java
@@ -3,6 +3,6 @@ package se.leap.bitmaskclient.base.models;
 public interface FeatureVersionCode {
     int RENAMED_EIP_IN_PREFERENCES = 132;
     int GEOIP_SERVICE = 148;
-    int CALYX_PROVIDER_LILYPAD_UPDATE = 163000;
-    int RISEUP_PROVIDER_LILYPAD_UPDATE = 164000;
+    int CALYX_PROVIDER_LILYPAD_UPDATE = 165000;
+    int RISEUP_PROVIDER_LILYPAD_UPDATE = 165000;
 }