1 files changed, 14 insertions, 12 deletions

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 5e05b7c1..9b4d431c 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
@@ -134,7 +134,7 @@ public class GatewaysManager {
       * @return the n closest Gateway
      */
     public GatewayOptions select(int nClosest) {
-        if (PreferenceHelper.useObfuscationPinning(context)) {
+        if (PreferenceHelper.useObfuscationPinning()) {
             if (nClosest > 2) {
                 // no need to try again the pinned proxy, probably configuration error
                 return null;
@@ -145,12 +145,12 @@ public class GatewaysManager {
             }
             return new GatewayOptions(gateway, OBFS4);
         }
-        String selectedCity = getPreferredCity(context);
+        String selectedCity = getPreferredCity();
         return select(nClosest, selectedCity);
     }
 
     public GatewayOptions select(int nClosest, String city) {
-        TransportType[] transportTypes = getUseBridges(context) ? new TransportType[]{OBFS4, OBFS4_HOP} : new TransportType[]{OPENVPN};
+        TransportType[] transportTypes = getUseBridges() ? new TransportType[]{OBFS4, OBFS4_HOP} : new TransportType[]{OPENVPN};
         if (presortedList.size() > 0) {
             return getGatewayFromPresortedList(nClosest, transportTypes, city);
         }
@@ -193,7 +193,7 @@ public class GatewaysManager {
 
         HashMap<String, Integer> locationNames = new HashMap<>();
         ArrayList<Location> locations = new ArrayList<>();
-        String preferredCity = PreferenceHelper.getPreferredCity(context);
+        String preferredCity = PreferenceHelper.getPreferredCity();
         for (Gateway gateway : gateways.values()) {
             String name = gateway.getName();
             if (name == null) {
@@ -399,16 +399,18 @@ public class GatewaysManager {
                  e.printStackTrace();
              }
 
-             if (PreferenceHelper.useObfuscationPinning(context)) {
+             if (PreferenceHelper.useObfuscationPinning()) {
                  try {
                      Transport[] transports = new Transport[]{
                              new Transport(OBFS4.toString(),
-                                     new String[]{getObfuscationPinningKCP(context) ? "kcp" : "tcp"},
-                                     new String[]{getObfuscationPinningPort(context)},
-                                     getObfuscationPinningCert(context))};
+                                     new String[]{getObfuscationPinningKCP() ? "kcp" : "tcp"},
+                                     new String[]{getObfuscationPinningPort()},
+                                     getObfuscationPinningCert())};
                      GatewayJson.Capabilities capabilities = new GatewayJson.Capabilities(false, false, false, transports, false);
-                     GatewayJson gatewayJson = new GatewayJson(context.getString(R.string.unknown_location), getObfuscationPinningIP(context), null, PINNED_OBFUSCATION_PROXY, capabilities);
-                     Gateway gateway = new Gateway(eipDefinition, secrets, new JSONObject(gatewayJson.toString()), this.context);
+                     GatewayJson gatewayJson = new GatewayJson(context.getString(R.string.unknown_location), getObfuscationPinningIP(
+
+                     ), null, PINNED_OBFUSCATION_PROXY, capabilities);
+                     Gateway gateway = new Gateway(eipDefinition, secrets, new JSONObject(gatewayJson.toString()));
                      addGateway(gateway);
                  } catch (JSONException | ConfigParser.ConfigParseError | IOException e) {
                      e.printStackTrace();
@@ -417,7 +419,7 @@ public class GatewaysManager {
                  for (int i = 0; i < gatewaysDefined.length(); i++) {
                      try {
                          JSONObject gw = gatewaysDefined.getJSONObject(i);
-                         Gateway aux = new Gateway(eipDefinition, secrets, gw, this.context);
+                         Gateway aux = new Gateway(eipDefinition, secrets, gw);
                          if (gateways.get(aux.getHost()) == null) {
                              addGateway(aux);
                          }
@@ -515,7 +517,7 @@ public class GatewaysManager {
     }
 
     private boolean handleGatewayPinning() {
-         String host = PreferenceHelper.getPinnedGateway(this.context);
+         String host = PreferenceHelper.getPinnedGateway();
          if (host == null) {
              return false;
          }