2 files changed, 21 insertions, 2 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 76ec9650..a11c7e34 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
@@ -41,6 +41,7 @@ import de.blinkt.openvpn.core.ConfigParser;
 import de.blinkt.openvpn.core.VpnStatus;
 import de.blinkt.openvpn.core.connection.Connection;
 import de.blinkt.openvpn.core.connection.Connection.TransportType;
+import se.leap.bitmaskclient.BuildConfig;
 import se.leap.bitmaskclient.base.models.Location;
 import se.leap.bitmaskclient.base.models.Provider;
 import se.leap.bitmaskclient.base.models.ProviderObservable;
@@ -338,9 +339,11 @@ public class GatewaysManager {
                      if (gateways.get(aux.getHost()) == null) {
                          addGateway(aux);
                      }
-                 } catch (JSONException | ConfigParser.ConfigParseError | IOException e) {
+                 } catch (JSONException | IOException e) {
                      e.printStackTrace();
                      VpnStatus.logError("Unable to parse gateway config!");
+                 } catch (ConfigParser.ConfigParseError e) {
+                     VpnStatus.logError("Unable to parse gateway config: " + e.getLocalizedMessage());
                  }
              }
          } catch (NullPointerException npe) {
@@ -419,6 +422,9 @@ public class GatewaysManager {
     private void configureFromCurrentProvider() {
          Provider provider = ProviderObservable.getInstance().getCurrentProvider();
          parseDefaultGateways(provider);
+         if (BuildConfig.BUILD_TYPE.equals("debug") && handleGatewayPinning()) {
+             return;
+         }
          if (hasSortedGatewaysWithLoad(provider)) {
              parseGatewaysWithLoad(provider);
          } else {
@@ -427,5 +433,17 @@ public class GatewaysManager {
 
     }
 
+    private boolean handleGatewayPinning() {
+         String host = PreferenceHelper.getPinnedGateway(this.context);
+         if (host == null) {
+             return false;
+         }
+         Gateway gateway = gateways.get(host);
+         gateways.clear();
+         if (gateway != null) {
+             gateways.put(host, gateway);
+         }
+         return true;
+    }
 
 }
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/VpnNotificationManager.java b/app/src/main/java/se/leap/bitmaskclient/eip/VpnNotificationManager.java
index d2603533..a869210e 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/VpnNotificationManager.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/VpnNotificationManager.java
@@ -196,7 +196,8 @@ public class VpnNotificationManager {
     }
 
     public void cancelAll() {
-        compatNotificationManager.cancelAll();
+        compatNotificationManager.cancel(OpenVPNService.NOTIFICATION_CHANNEL_NEWSTATUS_ID.hashCode());
+        compatNotificationManager.cancel(VoidVpnService.NOTIFICATION_CHANNEL_NEWSTATUS_ID.hashCode());
     }