1 files changed, 31 insertions, 11 deletions

diff --git a/main/src/main/java/de/blinkt/openvpn/VpnProfile.java b/main/src/main/java/de/blinkt/openvpn/VpnProfile.java
index 601fb2df..c8771e9f 100644
--- a/main/src/main/java/de/blinkt/openvpn/VpnProfile.java
+++ b/main/src/main/java/de/blinkt/openvpn/VpnProfile.java
@@ -12,18 +12,16 @@ import android.security.KeyChain;
 import android.security.KeyChainException;
 import android.util.Base64;
 
-import de.blinkt.openvpn.core.NativeUtils;
-import de.blinkt.openvpn.core.VpnStatus;
-import de.blinkt.openvpn.core.OpenVpnService;
-import de.blinkt.openvpn.core.X509Utils;
 import org.spongycastle.util.io.pem.PemObject;
 import org.spongycastle.util.io.pem.PemWriter;
 
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import java.io.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Serializable;
+import java.io.StringWriter;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.security.InvalidKeyException;
@@ -37,6 +35,16 @@ import java.util.Locale;
 import java.util.UUID;
 import java.util.Vector;
 
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+
+import de.blinkt.openvpn.core.NativeUtils;
+import de.blinkt.openvpn.core.OpenVpnService;
+import de.blinkt.openvpn.core.VpnStatus;
+import de.blinkt.openvpn.core.X509Utils;
+
 public class VpnProfile implements Serializable {
     // Note that this class cannot be moved to core where it belongs since
     // the profile loading depends on it being here
@@ -48,7 +56,9 @@ public class VpnProfile implements Serializable {
     public static final String EXTRA_PROFILEUUID = "de.blinkt.openvpn.profileUUID";
     public static final String INLINE_TAG = "[[INLINE]]";
     public static final String DISPLAYNAME_TAG = "[[NAME]]";
-    public static final String MINIVPN = "miniopenvpn";
+    private static final String MININONPIEVPN = "nopievpn";
+    private static final String MINIPIEVPN = "pievpn";
+
     private static final long serialVersionUID = 7085688938959334563L;
     private static final String OVPNCONFIGFILE = "android.conf";
     public static final int MAXLOGLEVEL = 4;
@@ -138,6 +148,14 @@ public class VpnProfile implements Serializable {
         mProfileVersion = CURRENT_PROFILE_VERSION;
     }
 
+    public static String getMiniVPNExecutableName()
+    {
+        if (Build.VERSION.SDK_INT  >= Build.VERSION_CODES.JELLY_BEAN)
+            return VpnProfile.MINIPIEVPN;
+        else
+            return VpnProfile.MININONPIEVPN;
+    }
+
     public static String openVpnEscape(String unescaped) {
         if (unescaped == null)
             return null;
@@ -538,7 +556,7 @@ public class VpnProfile implements Serializable {
 
         // Add fixed paramenters
         //args.add("/data/data/de.blinkt.openvpn/lib/openvpn");
-        args.add(cacheDir.getAbsolutePath() + "/" + VpnProfile.MINIVPN);
+        args.add(cacheDir.getAbsolutePath() + "/" + getMiniVPNExecutableName());
 
         args.add("--config");
         args.add(cacheDir.getAbsolutePath() + "/" + OVPNCONFIGFILE);
@@ -547,6 +565,8 @@ public class VpnProfile implements Serializable {
         return args.toArray(new String[args.size()]);
     }
 
+
+
     public Intent prepareIntent(Context context) {
         String prefix = context.getPackageName();