From 4853d6a3d3d8c1077feb61899f6b07b5f528607c Mon Sep 17 00:00:00 2001 From: cyberta Date: Tue, 18 May 2021 17:45:52 +0200 Subject: implement feature switch, so that gateway selection can be turned off on compile time, turned off for Bitmask for now --- app/src/main/java/se/leap/bitmaskclient/base/StartActivity.java | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'app/src/main/java/se/leap/bitmaskclient/base/StartActivity.java') 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 cf64905a..9d689e5d 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/StartActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/StartActivity.java @@ -30,6 +30,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import de.blinkt.openvpn.core.VpnStatus; +import se.leap.bitmaskclient.BuildConfig; import se.leap.bitmaskclient.providersetup.ProviderListActivity; import se.leap.bitmaskclient.eip.EipCommand; import se.leap.bitmaskclient.base.models.FeatureVersionCode; @@ -157,6 +158,11 @@ public class StartActivity extends Activity{ } } + // 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); + } + // ensure all upgrades have passed before storing new information storeAppVersion(); } -- cgit v1.2.3