Merge branch 'update_obfuscation_pinning_defaults' into 'master'

Update obfuscation pinning defaults

See merge request leap/bitmask_android!204

2 files changed, 3 insertions, 29 deletions

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 c4e2fb17..91894fb8 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
@@ -290,11 +290,9 @@ public class ConfigHelper {
             return BuildConfig.obfsvpn_ip != null &&
                     BuildConfig.obfsvpn_port != null &&
                     BuildConfig.obfsvpn_cert != null &&
-                    BuildConfig.obfsvpn_gateway_host != null &&
                     !BuildConfig.obfsvpn_ip.isEmpty() &&
                     !BuildConfig.obfsvpn_port.isEmpty() &&
-                    !BuildConfig.obfsvpn_cert.isEmpty() &&
-                    !BuildConfig.obfsvpn_gateway_host.isEmpty();
+                    !BuildConfig.obfsvpn_cert.isEmpty();
         }
         public static String obfsvpnIP() {
             return BuildConfig.obfsvpn_ip;
@@ -305,10 +303,6 @@ public class ConfigHelper {
         public static String obfsvpnCert() {
             return BuildConfig.obfsvpn_cert;
         }
-        public static String gatewayHost() {
-            return BuildConfig.obfsvpn_gateway_host;
-        }
-
         public static boolean useKcp() {
             return BuildConfig.obfsvpn_use_kcp;
         }
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 d9beffd3..4abeed1a 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
@@ -12,8 +12,6 @@ import static se.leap.bitmaskclient.base.models.Constants.GATEWAY_PINNING;
 import static se.leap.bitmaskclient.base.models.Constants.LAST_UPDATE_CHECK;
 import static se.leap.bitmaskclient.base.models.Constants.LAST_USED_PROFILE;
 import static se.leap.bitmaskclient.base.models.Constants.OBFUSCATION_PINNING_CERT;
-import static se.leap.bitmaskclient.base.models.Constants.OBFUSCATION_PINNING_GW_HOST;
-import static se.leap.bitmaskclient.base.models.Constants.OBFUSCATION_PINNING_GW_IP;
 import static se.leap.bitmaskclient.base.models.Constants.OBFUSCATION_PINNING_IP;
 import static se.leap.bitmaskclient.base.models.Constants.OBFUSCATION_PINNING_KCP;
 import static se.leap.bitmaskclient.base.models.Constants.OBFUSCATION_PINNING_LOCATION;
@@ -279,8 +277,7 @@ public class PreferenceHelper {
                 getBoolean(context, USE_OBFUSCATION_PINNING, false) &&
                 !TextUtils.isEmpty(getObfuscationPinningIP(context)) &&
                 !TextUtils.isEmpty(getObfuscationPinningCert(context)) &&
-                !TextUtils.isEmpty(getObfuscationPinningPort(context)) &&
-                !TextUtils.isEmpty(getObfuscationPinningGatewayHost(context));
+                !TextUtils.isEmpty(getObfuscationPinningPort(context));
     }
 
     public static void setObfuscationPinningIP(Context context, String ip) {
@@ -307,23 +304,6 @@ public class PreferenceHelper {
         return getString(context, OBFUSCATION_PINNING_CERT, null);
     }
 
-    public static void setObfuscationPinningGatewayHost(Context context, String gatewayIP) {
-        putString(context, OBFUSCATION_PINNING_GW_HOST, gatewayIP);
-    }
-
-    public static String getObfuscationPinningGatewayHost(Context context) {
-        return getString(context, OBFUSCATION_PINNING_GW_HOST, null);
-    }
-
-
-    public static void setObfuscationPinningGatewayIP(Context context, String ipForHost) {
-        putString(context, OBFUSCATION_PINNING_GW_IP, ipForHost);
-    }
-
-    public static String getObfuscationPinningGatewayIP(Context context) {
-        return getString(context, OBFUSCATION_PINNING_GW_IP, null);
-    }
-
     public static void setObfuscationPinningGatewayLocation(Context context, String location) {
         putString(context, OBFUSCATION_PINNING_LOCATION, location);
     }
@@ -357,7 +337,7 @@ public class PreferenceHelper {
     }
 
     public static String getPreferredCity(Context context) {
-        return getString(context, PREFERRED_CITY, null);
+        return useObfuscationPinning(context) ? null : getString(context, PREFERRED_CITY, null);
     }
 
     @WorkerThread