Merge branch 'gateway_selector' into 'master'

Gateway selector

See merge request leap/bitmask_android!132

1 files changed, 6 insertions, 0 deletions

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();
     }