From c02cfd04253c5f5c839410d418789884b9bfb13a Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 16 Mar 2021 22:09:07 +0100
Subject: Adapt gateway selector to check for nearest gateway within a city.
 Also optionally parse sortedGateways json object from menshen backend reponse

---
 .../main/java/se/leap/bitmaskclient/base/models/Constants.java   | 4 ++++
 .../java/se/leap/bitmaskclient/base/utils/PreferenceHelper.java  | 9 +++++++++
 2 files changed, 13 insertions(+)

(limited to 'app/src/main/java/se/leap/bitmaskclient/base')

diff --git a/app/src/main/java/se/leap/bitmaskclient/base/models/Constants.java b/app/src/main/java/se/leap/bitmaskclient/base/models/Constants.java
index a0d295bd..3edfbb3d 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/models/Constants.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/models/Constants.java
@@ -40,6 +40,7 @@ public interface Constants {
     String USE_IPv6_FIREWALL = "use_ipv6_firewall";
     String RESTART_ON_UPDATE = "restart_on_update";
     String LAST_UPDATE_CHECK = "last_update_check";
+    String PREFERRED_CITY = "preferred_city";
 
 
      //////////////////////////////////////////////
@@ -173,4 +174,7 @@ public interface Constants {
     String OPENVPN_CONFIGURATION = "openvpn_configuration";
     String GATEWAYS = "gateways";
     String HOST = "host";
+    String SORTED_GATEWAYS = "sortedGateways";
+    String FULLNESS = "fullness";
+    String OVERLOAD = "overload";
 }
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 d31c7a20..19b30b4d 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
@@ -24,6 +24,7 @@ import static se.leap.bitmaskclient.base.models.Constants.DEFAULT_SHARED_PREFS_B
 import static se.leap.bitmaskclient.base.models.Constants.EXCLUDED_APPS;
 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.PREFERRED_CITY;
 import static se.leap.bitmaskclient.base.models.Constants.PROVIDER_CONFIGURED;
 import static se.leap.bitmaskclient.base.models.Constants.PROVIDER_EIP_DEFINITION;
 import static se.leap.bitmaskclient.base.models.Constants.PROVIDER_PRIVATE_KEY;
@@ -203,6 +204,14 @@ public class PreferenceHelper {
         return getBoolean(context, ALWAYS_ON_SHOW_DIALOG, true);
     }
 
+    public static String getSelectedCity(Context context) {
+        return getString(context, PREFERRED_CITY, null);
+    }
+
+    public static void setPreferredCity(Context context, String city) {
+        putString(context, PREFERRED_CITY, city);
+    }
+
     public static JSONObject getEipDefinitionFromPreferences(SharedPreferences preferences) {
         JSONObject result = new JSONObject();
         try {
-- 
cgit v1.2.3