From cf7c06399618952da0b40d923da81651e546e83d Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Thu, 24 May 2012 10:02:19 +0200
Subject: - fix cn remote string (closes issue #31) - ignore a few more options
 in the importer

---
 src/de/blinkt/openvpn/ConfigParser.java   | 7 +++++--
 src/de/blinkt/openvpn/OpenVPNThread.java  | 5 -----
 src/de/blinkt/openvpn/ProfileManager.java | 2 --
 3 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/de/blinkt')

diff --git a/src/de/blinkt/openvpn/ConfigParser.java b/src/de/blinkt/openvpn/ConfigParser.java
index 4447eaf9..85107104 100644
--- a/src/de/blinkt/openvpn/ConfigParser.java
+++ b/src/de/blinkt/openvpn/ConfigParser.java
@@ -220,8 +220,11 @@ public class ConfigParser {
 			"topology",
 			"persist-tun",
 			"route-metric",
-			"suppress-timestamps"
-			
+			"suppress-timestamps",
+			"management-query-passwords",
+			"tmp-dir",
+			"management-hold",
+			"management"
 	};
 	
 	
diff --git a/src/de/blinkt/openvpn/OpenVPNThread.java b/src/de/blinkt/openvpn/OpenVPNThread.java
index 503f4c4c..fdb0ac02 100644
--- a/src/de/blinkt/openvpn/OpenVPNThread.java
+++ b/src/de/blinkt/openvpn/OpenVPNThread.java
@@ -10,14 +10,12 @@ import android.util.Log;
 
 public class OpenVPNThread implements Runnable {
 	private static final String TAG = "OpenVPN";
-	private OpenVpnService mService;
 	private String[] mArgv;
 	private Process mProcess;
 	private String mNativeDir;
 
 	public OpenVPNThread(OpenVpnService service,String[] argv, String nativelibdir)
 	{
-		mService = service;
 		mArgv = argv;
 		mNativeDir = nativelibdir;
 	}
@@ -31,9 +29,6 @@ public class OpenVPNThread implements Runnable {
 		try {
 			Log.i(TAG, "Starting openvpn");			
 			startOpenVPNThreadArgs(mArgv);
-
-			
-			//}
 			Log.i(TAG, "Giving up");
 		} catch (Exception e) {
 			Log.e(TAG, "Got " + e.toString());
diff --git a/src/de/blinkt/openvpn/ProfileManager.java b/src/de/blinkt/openvpn/ProfileManager.java
index eb94505a..0164fe53 100644
--- a/src/de/blinkt/openvpn/ProfileManager.java
+++ b/src/de/blinkt/openvpn/ProfileManager.java
@@ -10,8 +10,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
 
-import de.blinkt.openvpn.R.string;
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
-- 
cgit v1.2.3