From 49b18fcdc45433d34eefb46ab236144e19022dcb Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 23 Jul 2020 16:56:41 +0200
Subject: implement gateway selection based on geoip service

---
 app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java b/app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java
index 669b7f8e..87bd5f93 100644
--- a/app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java
+++ b/app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java
@@ -47,6 +47,7 @@ public class PreferenceHelper {
             provider.setMainUrl(new URL(preferences.getString(Provider.MAIN_URL, "")));
             provider.setProviderIp(preferences.getString(Provider.PROVIDER_IP, ""));
             provider.setProviderApiIp(preferences.getString(Provider.PROVIDER_API_IP, ""));
+            provider.setGeoipUrl(preferences.getString(Provider.GEOIP_URL, ""));
             provider.define(new JSONObject(preferences.getString(Provider.KEY, "")));
             provider.setCaCert(preferences.getString(Provider.CA_CERT, ""));
             provider.setVpnCertificate(preferences.getString(PROVIDER_VPN_CERTIFICATE, ""));
@@ -68,6 +69,7 @@ public class PreferenceHelper {
     public static void storeProviderInPreferences(SharedPreferences preferences, Provider provider) {
         preferences.edit().putBoolean(PROVIDER_CONFIGURED, true).
                 putString(Provider.PROVIDER_IP, provider.getProviderIp()).
+                putString(Provider.GEOIP_URL, provider.getGeoipUrl().toString()).
                 putString(Provider.PROVIDER_API_IP, provider.getProviderApiIp()).
                 putString(Provider.MAIN_URL, provider.getMainUrlString()).
                 putString(Provider.KEY, provider.getDefinitionString()).
@@ -82,6 +84,7 @@ public class PreferenceHelper {
                 putString(Provider.PROVIDER_IP + "." + providerDomain, provider.getProviderIp()).
                 putString(Provider.PROVIDER_API_IP + "." + providerDomain, provider.getProviderApiIp()).
                 putString(Provider.MAIN_URL + "." + providerDomain, provider.getMainUrlString()).
+                putString(Provider.GEOIP_URL + "." + providerDomain, provider.getGeoipUrl().toString()).
                 putString(Provider.KEY + "." + providerDomain, provider.getDefinitionString()).
                 putString(Provider.CA_CERT + "." + providerDomain, provider.getCaCert()).
                 putString(PROVIDER_EIP_DEFINITION + "." + providerDomain, provider.getEipServiceJsonString()).
@@ -114,6 +117,7 @@ public class PreferenceHelper {
                 remove(Provider.PROVIDER_IP + "." + providerDomain).
                 remove(Provider.PROVIDER_API_IP + "." + providerDomain).
                 remove(Provider.MAIN_URL + "." + providerDomain).
+                remove(Provider.GEOIP_URL + "." + providerDomain).
                 remove(PROVIDER_EIP_DEFINITION + "." + providerDomain).
                 remove(PROVIDER_PRIVATE_KEY + "." + providerDomain).
                 remove(PROVIDER_VPN_CERTIFICATE + "." + providerDomain).
-- 
cgit v1.2.3