diff options
author | cyBerta <cyberta@riseup.net> | 2024-01-25 23:17:16 +0100 |
---|---|---|
committer | cyBerta <cyberta@riseup.net> | 2024-01-25 23:17:16 +0100 |
commit | b6c2c7c8ffbcf87110c33e179f1506285dffd949 (patch) | |
tree | 0d3c7a0b8a0a1e5ece941e978c203083d005bfb4 /app/src/main/java/se/leap/bitmaskclient/base/utils | |
parent | b85dc1b2ea68ab7ca7e11ab545bb88f4dbb59bdb (diff) |
rename ObfsvpnHelper to BuildConfigHelper, adding other BuildConfig properties there
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/base/utils')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/base/utils/BuildConfigHelper.java (renamed from app/src/main/java/se/leap/bitmaskclient/base/utils/ObfsVpnHelper.java) | 22 | ||||
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/base/utils/ConfigHelper.java | 6 | ||||
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/base/utils/PreferenceHelper.java | 2 |
3 files changed, 18 insertions, 12 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/utils/ObfsVpnHelper.java b/app/src/main/java/se/leap/bitmaskclient/base/utils/BuildConfigHelper.java index 054c85b3..e1f65b5e 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/utils/ObfsVpnHelper.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/utils/BuildConfigHelper.java @@ -1,23 +1,26 @@ package se.leap.bitmaskclient.base.utils; +import static se.leap.bitmaskclient.base.models.Constants.DEFAULT_BITMASK; + import androidx.annotation.VisibleForTesting; import de.blinkt.openvpn.core.NativeUtils; import se.leap.bitmaskclient.BuildConfig; // ObfsVpnHelper class allows us to mock BuildConfig fields related to the pre-shipped circumvention settings -public class ObfsVpnHelper { +public class BuildConfigHelper { - public interface ObfsVpnHelperInterface { + public interface BuildConfigHelperInterface { boolean useObfsVpn(); boolean hasObfuscationPinningDefaults(); String obfsvpnIP(); String obfsvpnPort(); String obfsvpnCert(); boolean useKcp(); + boolean isDefaultBitmask(); } - public static class DefaultObfsVpnHelper implements ObfsVpnHelperInterface { + public static class DefaultBuildConfigHelper implements BuildConfigHelperInterface { @Override public boolean useObfsVpn() { return BuildConfig.use_obfsvpn; @@ -52,12 +55,17 @@ public class ObfsVpnHelper { public boolean useKcp() { return BuildConfig.obfsvpn_use_kcp; } + + @Override + public boolean isDefaultBitmask() { + return BuildConfig.FLAVOR_branding.equals(DEFAULT_BITMASK); + } } - private static ObfsVpnHelperInterface instance = new DefaultObfsVpnHelper(); + private static BuildConfigHelperInterface instance = new DefaultBuildConfigHelper(); @VisibleForTesting - public ObfsVpnHelper(ObfsVpnHelperInterface helperInterface) { + public BuildConfigHelper(BuildConfigHelperInterface helperInterface) { if (!NativeUtils.isUnitTest()) { throw new IllegalStateException("ObfsVpnHelper injected with ObfsVpnHelperInterface outside of an unit test"); } @@ -83,4 +91,8 @@ public class ObfsVpnHelper { public static boolean useKcp() { return instance.useKcp(); } + + public static boolean isDefaultBitmask() { + return instance.isDefaultBitmask(); + } } diff --git a/app/src/main/java/se/leap/bitmaskclient/base/utils/ConfigHelper.java b/app/src/main/java/se/leap/bitmaskclient/base/utils/ConfigHelper.java index a06d85be..a7916399 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/utils/ConfigHelper.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/utils/ConfigHelper.java @@ -16,8 +16,6 @@ */ package se.leap.bitmaskclient.base.utils; -import static se.leap.bitmaskclient.base.models.Constants.DEFAULT_BITMASK; - import android.app.PendingIntent; import android.content.Context; import android.content.res.Resources; @@ -159,10 +157,6 @@ public class ConfigHelper { } } - public static boolean isDefaultBitmask() { - return BuildConfig.FLAVOR_branding.equals(DEFAULT_BITMASK); - } - public static boolean preferAnonymousUsage() { return BuildConfig.priotize_anonymous_usage; } 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 a04c3686..2420a797 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 @@ -470,7 +470,7 @@ public class PreferenceHelper { } public static boolean useObfuscationPinning() { - return ObfsVpnHelper.useObfsVpn() && + return BuildConfigHelper.useObfsVpn() && getUseBridges() && getBoolean(USE_OBFUSCATION_PINNING, false) && !TextUtils.isEmpty(getObfuscationPinningIP()) && |