From 153e35707ed2854d89c61fdb9f82a6e9ec0db9cc Mon Sep 17 00:00:00 2001
From: Fup Duck <fupduck@sacknagel.com>
Date: Sat, 13 Jan 2018 17:03:14 +0100
Subject: more static constant import and import cleanup

---
 app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java  | 8 +++++---
 .../main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java   | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

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

diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java b/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
index 43c16d00..0b330ed9 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
@@ -36,9 +36,11 @@ import java.util.List;
 import de.blinkt.openvpn.VpnProfile;
 import de.blinkt.openvpn.core.Connection;
 import de.blinkt.openvpn.core.ProfileManager;
-import se.leap.bitmaskclient.Constants;
 import se.leap.bitmaskclient.Provider;
 
+import static se.leap.bitmaskclient.Constants.PROVIDER_PRIVATE_KEY;
+import static se.leap.bitmaskclient.Constants.PROVIDER_VPN_CERTIFICATE;
+
 /**
  * @author parmegv
  */
@@ -124,8 +126,8 @@ public class GatewaysManager {
         JSONObject result = new JSONObject();
         try {
             result.put(Provider.CA_CERT, preferences.getString(Provider.CA_CERT, ""));
-            result.put(Constants.PROVIDER_PRIVATE_KEY, preferences.getString(Constants.PROVIDER_PRIVATE_KEY, ""));
-            result.put(Constants.PROVIDER_VPN_CERTIFICATE, preferences.getString(Constants.PROVIDER_VPN_CERTIFICATE, ""));
+            result.put(PROVIDER_PRIVATE_KEY, preferences.getString(PROVIDER_PRIVATE_KEY, ""));
+            result.put(PROVIDER_VPN_CERTIFICATE, preferences.getString(PROVIDER_VPN_CERTIFICATE, ""));
         } catch (JSONException e) {
             e.printStackTrace();
         }
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java b/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java
index e9c16dda..6f0ccf18 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java
@@ -22,9 +22,11 @@ import org.json.JSONObject;
 
 import java.util.Iterator;
 
-import se.leap.bitmaskclient.Constants;
 import se.leap.bitmaskclient.Provider;
 
+import static se.leap.bitmaskclient.Constants.PROVIDER_PRIVATE_KEY;
+import static se.leap.bitmaskclient.Constants.PROVIDER_VPN_CERTIFICATE;
+
 public class VpnConfigGenerator {
 
     private JSONObject general_configuration;
@@ -121,14 +123,14 @@ public class VpnConfigGenerator {
             String key =
                     "<key>"
                             + newLine
-                            + secrets.getString(Constants.PROVIDER_PRIVATE_KEY)
+                            + secrets.getString(PROVIDER_PRIVATE_KEY)
                             + newLine
                             + "</key>";
 
             String openvpnCert =
                     "<cert>"
                             + newLine
-                            + secrets.getString(Constants.PROVIDER_VPN_CERTIFICATE)
+                            + secrets.getString(PROVIDER_VPN_CERTIFICATE)
                             + newLine
                             + "</cert>";
 
-- 
cgit v1.2.3