diff options
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rwxr-xr-x | build-native.sh | 1 | ||||
| -rw-r--r-- | jni/Android.mk | 4 | ||||
| -rw-r--r-- | jni/Application.mk | 1 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/ConfigParser.java | 2 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/LaunchVPN.java | 4 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/OpenVPNThread.java | 2 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/VpnProfile.java | 9 |
8 files changed, 16 insertions, 11 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c3c440b8..e86761c3 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -17,8 +17,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="de.blinkt.openvpn" - android:versionCode="42" - android:versionName="0.5.16" > + android:versionCode="43" + android:versionName="0.5.17" > <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> diff --git a/build-native.sh b/build-native.sh index af9fcf57..2848fdd2 100755 --- a/build-native.sh +++ b/build-native.sh @@ -1,6 +1,7 @@ ndk-build APP_API=all -j 8 if [ $? = 0 ]; then cd libs + mkdir -p ../assets for i in * do cp -v $i/minivpn ../assets/minivpn.$i diff --git a/jni/Android.mk b/jni/Android.mk index cdfbed8d..3514b920 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -1,6 +1,4 @@ # Path of the sources - - JNI_DIR := $(call my-dir) include lzo/Android.mk @@ -23,7 +21,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -LOCAL_LDLIBS := -lz -lc +LOCAL_LDLIBS := -lz -lc LOCAL_SHARED_LIBRARIES := libssl libcrypto openvpn LOCAL_SRC_FILES:= minivpn.c LOCAL_MODULE = minivpn diff --git a/jni/Application.mk b/jni/Application.mk index e33410ed..38ce95f3 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1,4 +1,5 @@ APP_ABI := all +NDK_TOOLCHAIN_VERSION=4.4.3 #APP_PLATFORM := android-14 #APP_OPTIM := release diff --git a/src/de/blinkt/openvpn/ConfigParser.java b/src/de/blinkt/openvpn/ConfigParser.java index f9eac745..c8fb3870 100644 --- a/src/de/blinkt/openvpn/ConfigParser.java +++ b/src/de/blinkt/openvpn/ConfigParser.java @@ -472,7 +472,7 @@ public class ConfigParser { for(Vector<Vector<String>> option:options.values()) { for(Vector<String> optionsline: option) { for (String arg : optionsline) - custom+= arg + " "; + custom+= VpnProfile.openVpnEscape(arg) + " "; } custom+="\n"; diff --git a/src/de/blinkt/openvpn/LaunchVPN.java b/src/de/blinkt/openvpn/LaunchVPN.java index 04294c33..bfc6256e 100644 --- a/src/de/blinkt/openvpn/LaunchVPN.java +++ b/src/de/blinkt/openvpn/LaunchVPN.java @@ -90,7 +90,7 @@ public class LaunchVPN extends ListActivity implements OnItemClickListener { mPM =ProfileManager.getInstance(this); - } + } @Override protected void onStart() { @@ -224,7 +224,7 @@ public class LaunchVPN extends ListActivity implements OnItemClickListener { } private boolean writeMiniVPN() { - File mvpnout = new File(getCacheDir(),"miniovpn"); + File mvpnout = new File(getCacheDir(),VpnProfile.MINIVPN); if (mvpnout.exists() && mvpnout.canExecute()) return true; diff --git a/src/de/blinkt/openvpn/OpenVPNThread.java b/src/de/blinkt/openvpn/OpenVPNThread.java index 4477fa5f..97e07c9d 100644 --- a/src/de/blinkt/openvpn/OpenVPNThread.java +++ b/src/de/blinkt/openvpn/OpenVPNThread.java @@ -58,7 +58,7 @@ public class OpenVPNThread implements Runnable { // Hack O rama
// Hack until I find a good way to get the real library path
- String applibpath = argv[0].replace("/cache/miniovpn", "/lib");
+ String applibpath = argv[0].replace("/cache/" + VpnProfile.MINIVPN , "/lib");
String lbpath = pb.environment().get("LD_LIBRARY_PATH");
if(lbpath==null)
diff --git a/src/de/blinkt/openvpn/VpnProfile.java b/src/de/blinkt/openvpn/VpnProfile.java index 91c4c494..4e381fcc 100644 --- a/src/de/blinkt/openvpn/VpnProfile.java +++ b/src/de/blinkt/openvpn/VpnProfile.java @@ -97,6 +97,7 @@ public class VpnProfile implements Serializable{ public boolean mUseDefaultRoutev6=true; public String mCustomRoutesv6=""; public String mKeyPassword=""; + static final String MINIVPN = "miniopenvpn"; @@ -116,7 +117,11 @@ public class VpnProfile implements Serializable{ String escapedString = unescaped.replace("\\", "\\\\"); escapedString = escapedString.replace("\"","\\\""); escapedString = escapedString.replace("\n","\\n"); - return '"' + escapedString + '"'; + + if (escapedString.equals(unescaped) && !escapedString.contains(" ")) + return unescaped; + else + return '"' + escapedString + '"'; } @@ -428,7 +433,7 @@ public class VpnProfile implements Serializable{ // Add fixed paramenters //args.add("/data/data/de.blinkt.openvpn/lib/openvpn"); - args.add(cacheDir.getAbsolutePath() +"/" +"miniovpn"); + args.add(cacheDir.getAbsolutePath() +"/" + VpnProfile.MINIVPN); args.add("--config"); args.add(cacheDir.getAbsolutePath() + "/" + OVPNCONFIGFILE); |