summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2022-08-10 12:36:44 +0000
committercyberta <cyberta@riseup.net>2022-08-10 12:36:44 +0000
commit5b9505dbb37d110b8c528671bbfc67f7944d2e43 (patch)
tree659bf7bc84ee90a03fe796e452903aae433f559b
parent2603b325972b32c0c3cec8905ab6e5a56cc4c6bc (diff)
parent7445bdd71ec3dff82459790cab082056d37e016f (diff)
Merge branch 'prepare_1.1.5RC2' into 'master'
Prepare 1.1.5 rc2 See merge request leap/bitmask_android!209
-rw-r--r--CHANGELOG8
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/base/StartActivity.java19
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/base/models/FeatureVersionCode.java4
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;
}