Version 0.5.2

Fix minivpn vs openvpn. (closes issue #16)
If minivpn binary is already available don't write it (closes issue #15)

1 files changed, 16 insertions, 3 deletions

diff --git a/src/de/blinkt/openvpn/VpnProfile.java b/src/de/blinkt/openvpn/VpnProfile.java
index 26cf50bd..63d6876e 100644
--- a/src/de/blinkt/openvpn/VpnProfile.java
+++ b/src/de/blinkt/openvpn/VpnProfile.java
@@ -90,10 +90,13 @@ public class VpnProfile implements  Serializable{
 	public boolean mUseCustomConfig=false;
 	public String mCustomConfigOptions="";
 	public String mVerb="1";
+	public String mCipher="";
 
 
-	public static String openVpnEscape(String unescape) {
-		String escapedString = unescape.replace("\\", "\\\\");
+	public static String openVpnEscape(String unescaped) {
+		if(unescaped==null)
+			return null;
+		String escapedString = unescaped.replace("\\", "\\\\");
 		escapedString = escapedString.replace("\"","\\\"");
 		escapedString = escapedString.replace("\n","\\n");
 		return '"' + escapedString + '"';
@@ -269,6 +272,9 @@ public class VpnProfile implements  Serializable{
 			cfg += "remote-cert-tls server\n";
 
 
+		if(nonNull(mCipher)){
+			cfg += "cipher " + mCipher + "\n";
+		}
 
 
 		// Obscure Settings dialog
@@ -291,6 +297,13 @@ public class VpnProfile implements  Serializable{
 		return cfg;
 	}
 
+	private boolean nonNull(String val) {
+		if(val == null || val.equals("")) 
+			return false;
+		else
+			return true;
+	}
+
 	private Collection<String> getCustomRoutes() {
 		Vector<String> cidrRoutes=new Vector<String>();
 		if(mCustomRoutes==null) {
@@ -343,7 +356,7 @@ public class VpnProfile implements  Serializable{
 		Vector<String> args = new Vector<String>();
 
 		// Add fixed paramenters
-		//args.add(cacheDir.getAbsolutePath() +"/" +"openvpn");
+		//args.add("/data/data/de.blinkt.openvpn/lib/openvpn");
 		args.add(cacheDir.getAbsolutePath() +"/" +"minivpn");
 
 		args.add("--config");