From e86d8b67696568b17854ccdc846191dc9635841d Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Wed, 9 May 2012 17:57:40 +0200 Subject: Only try to write minivpn once per program lifetime. Remove debug logging --- src/de/blinkt/openvpn/OpenVPNThread.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/de/blinkt/openvpn/OpenVPNThread.java') diff --git a/src/de/blinkt/openvpn/OpenVPNThread.java b/src/de/blinkt/openvpn/OpenVPNThread.java index d4d4cd64..008598e4 100644 --- a/src/de/blinkt/openvpn/OpenVPNThread.java +++ b/src/de/blinkt/openvpn/OpenVPNThread.java @@ -44,7 +44,7 @@ public class OpenVPNThread implements Runnable { // Log argv - OpenVPN.logMessage(0, "argv:" , Arrays.toString(mArgv)); + //OpenVPN.logMessage(0, "argv:" , Arrays.toString(mArgv)); startOpenVPNThreadArgs(mArgv); @@ -77,7 +77,17 @@ public class OpenVPNThread implements Runnable { ProcessBuilder pb = new ProcessBuilder(argvlist); // Hack O rama - pb.environment().put("LD_LIBRARY_PATH", "/data/data/de.blinkt.openvpn/lib"); + + // Hack until I find a good way to get the real library path + String applibpath = argv[0].replace("/cache/minivpn", "/lib"); + + String lbpath = pb.environment().get("LD_LIBRARY_PATH"); + if(lbpath==null) + lbpath = applibpath; + else + lbpath = lbpath + ":" + applibpath; + + pb.environment().put("LD_LIBRARY_PATH", lbpath); pb.redirectErrorStream(true); try { mProcess = pb.start(); -- cgit v1.2.3