summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2022-12-28 15:44:00 +0000
committercyberta <cyberta@riseup.net>2022-12-28 15:44:00 +0000
commit6128136ddf9bb3626104c739db65e9e005211116 (patch)
treec0be56531001441d381b263d6a12a11b6ef0e9e2 /app
parent9d64ea1f6274ca66c4e44f7bd24698a1f64c3ffe (diff)
parentf59a9ee44285b02db65c40552137b4a57ffb2274 (diff)
Merge branch 'default_udp' into 'master'
RiseupVPN: default to udp on fresh installs See merge request leap/bitmask_android!236
Diffstat (limited to 'app')
-rw-r--r--app/build.gradle4
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/base/utils/PreferenceHelper.java3
2 files changed, 6 insertions, 1 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 8172ac08..92120f88 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -52,6 +52,8 @@ android {
buildConfigField "String", "obfsvpn_ip", '""'
buildConfigField "String", "obfsvpn_cert", '""'
buildConfigField 'boolean', 'obfsvpn_use_kcp', 'false'
+ // default to UDP usage
+ buildConfigField 'boolean', 'prefer_udp', 'false'
// static update url pointing to the latest stable release apk
buildConfigField "String", "update_apk_url", '"https://dl.bitmask.net/client/android/Bitmask-Android-latest.apk"'
@@ -155,6 +157,8 @@ android {
buildConfigField "String", "obfsvpn_ip", '"159.223.173.205"'
buildConfigField "String", "obfsvpn_cert", '"8nuAbPJwFrKc/29KcCfL5LBuEWxQrjBASYXdUbwcm9d9pKseGK4r2Tg47e23+t6WghxGGw"'
buildConfigField 'boolean', 'obfsvpn_use_kcp', 'true'
+ // default to UDP usage
+ buildConfigField 'boolean', 'prefer_udp', 'true'
//Build Config Fields for automatic apk update checks
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/utils/PreferenceHelper.java b/app/src/main/java/se/leap/bitmaskclient/base/utils/PreferenceHelper.java
index ff3b5ab1..9cba221a 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/utils/PreferenceHelper.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/utils/PreferenceHelper.java
@@ -50,6 +50,7 @@ import java.util.HashSet;
import java.util.Set;
import de.blinkt.openvpn.VpnProfile;
+import se.leap.bitmaskclient.BuildConfig;
import se.leap.bitmaskclient.base.models.Provider;
import se.leap.bitmaskclient.tor.TorStatusObservable;
@@ -220,7 +221,7 @@ public class PreferenceHelper {
}
public static boolean getPreferUDP(Context context) {
- return getBoolean(context, PREFER_UDP, false);
+ return getBoolean(context, PREFER_UDP, BuildConfig.prefer_udp);
}
public static void preferUDP(Context context, boolean prefer) {