2 files changed, 4 insertions, 7 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
index eb83814a..73c7337b 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
@@ -42,8 +42,6 @@ public final class EIP extends IntentService {
     public final static String TAG = EIP.class.getSimpleName();
     public final static String SERVICE_API_PATH = "config/eip-service.json";
 
-    public static final int DISCONNECT = 15;
-
     private static Context context;
     private static ResultReceiver mReceiver;
     private static SharedPreferences preferences;
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 10a95dfb..53d81ed3 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java
@@ -79,7 +79,6 @@ public class VpnConfigGenerator {
         String ports_keyword = "ports";
         String protocol_keyword = "protocols";
         String capabilities_keyword = "capabilities";
-        String udp = "udp";
 
         try {
             String ip_address = gateway.getString(ip_address_keyword);
@@ -93,9 +92,7 @@ public class VpnConfigGenerator {
                     String protocol = protocols.optString(j);
                     String new_remote = remote_keyword + " " + ip_address + " " + port + " " + protocol + new_line;
 
-                    port_specific_remotes = protocol.equalsIgnoreCase(udp) ?
-                            port_specific_remotes.replaceFirst(remote_keyword, new_remote + new_line + remote_keyword) :
-                            new_remote;
+                    port_specific_remotes += new_remote;
                 }
                 remotes += port_specific_remotes;
             }
@@ -103,7 +100,9 @@ public class VpnConfigGenerator {
             // TODO Auto-generated catch block
             e.printStackTrace();
         }
-
+        if (remotes.endsWith(new_line)) {
+            remotes = remotes.substring(0, remotes.lastIndexOf(new_line));
+        }
         return remotes;
     }