Merge branch 'develop'0.7.0

13 files changed, 535 insertions, 451 deletions

diff --git a/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java b/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java
index 3f80eef0..a424a489 100644
--- a/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java
+++ b/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java
@@ -113,6 +113,7 @@ public class LaunchVPN extends Activity {
 		}
 	}
 
+
 	@Override
 	protected void onActivityResult (int requestCode, int resultCode, Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);
diff --git a/app/src/main/java/de/blinkt/openvpn/VpnProfile.java b/app/src/main/java/de/blinkt/openvpn/VpnProfile.java
index d44d0f5a..6fec5f46 100644
--- a/app/src/main/java/de/blinkt/openvpn/VpnProfile.java
+++ b/app/src/main/java/de/blinkt/openvpn/VpnProfile.java
@@ -47,7 +47,7 @@ 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.OpenVPNService;
 import de.blinkt.openvpn.core.VpnStatus;
 import de.blinkt.openvpn.core.X509Utils;
 
@@ -69,6 +69,7 @@ public class VpnProfile implements Serializable {
     private static final String OVPNCONFIGFILE = "android.conf";
     public static final int MAXLOGLEVEL = 4;
     public static final int CURRENT_PROFILE_VERSION = 2;
+    public static final int DEFAULT_MSSFIX_SIZE = 1450;
     public static String DEFAULT_DNS1 = "8.8.8.8";
     public static String DEFAULT_DNS2 = "8.8.4.4";
 
@@ -147,6 +148,9 @@ public class VpnProfile implements Serializable {
     private int mProfileVersion;
     public String mExcludedRoutes;
     public String mExcludedRoutesv6;
+    public int mMssFix =0; // -1 is default,
+
+
 
     public VpnProfile(String name) {
         mUuid = UUID.randomUUID();
@@ -186,6 +190,7 @@ public class VpnProfile implements Serializable {
         mCheckRemoteCN = false;
         mPersistTun = false;
         mAllowLocalLAN = true;
+        mMssFix = 0;
     }
 
     public UUID getUUID() {
@@ -389,6 +394,13 @@ public class VpnProfile implements Serializable {
 
         }
 
+        if (mMssFix !=0){
+            if (mMssFix!=1450)
+                cfg+=String.format("mssfix %d\n", mMssFix, Locale.US);
+            else
+                cfg+="mssfix\n";
+        }
+
         if (mNobind)
             cfg += "nobind\n";
 
@@ -570,7 +582,7 @@ public class VpnProfile implements Serializable {
     public Intent prepareIntent(Context context) {
         String prefix = context.getPackageName();
 
-        Intent intent = new Intent(context, OpenVpnService.class);
+        Intent intent = new Intent(context, OpenVPNService.class);
 
         if (mAuthenticationType == VpnProfile.TYPE_KEYSTORE || mAuthenticationType == VpnProfile.TYPE_USERPASS_KEYSTORE) {
             if (getKeyStoreCertificates(context) == null)
diff --git a/app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java b/app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java
index 8e418053..5910173a 100644
--- a/app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java
+++ b/app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java
@@ -6,14 +6,14 @@ import android.content.*;
 import android.os.IBinder;
 
 import se.leap.bitmaskclient.R;
-import de.blinkt.openvpn.core.OpenVpnService;
+import de.blinkt.openvpn.core.OpenVPNService;
 import de.blinkt.openvpn.core.ProfileManager;
 
 /**
  * Created by arne on 13.10.13.
  */
 public class DisconnectVPN extends Activity implements DialogInterface.OnClickListener{
-    protected OpenVpnService mService;
+    protected OpenVPNService mService;
 
     private ServiceConnection mConnection = new ServiceConnection() {
 
@@ -22,7 +22,7 @@ public class DisconnectVPN extends Activity implements DialogInterface.OnClickLi
         public void onServiceConnected(ComponentName className,
                                        IBinder service) {
             // We've bound to LocalService, cast the IBinder and get LocalService instance
-            OpenVpnService.LocalBinder binder = (OpenVpnService.LocalBinder) service;
+            OpenVPNService.LocalBinder binder = (OpenVPNService.LocalBinder) service;
             mService = binder.getService();
         }
 
@@ -36,8 +36,8 @@ public class DisconnectVPN extends Activity implements DialogInterface.OnClickLi
     @Override
     protected void onResume() {
         super.onResume();
-        Intent intent = new Intent(this, OpenVpnService.class);
-        intent.setAction(OpenVpnService.START_SERVICE);
+        Intent intent = new Intent(this, OpenVPNService.class);
+        intent.setAction(OpenVPNService.START_SERVICE);
         bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
         showDisconnectDialog();
     }
diff --git a/app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java b/app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
index d23b521f..9c3621e0 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
@@ -432,6 +432,19 @@ public class ConfigParser {
             throw new ConfigParseError("Sorry. Only tun mode is supported. See the FAQ for more detail");
 		}
 
+        Vector<String> mssfix = getOption("mssfix",0,1);
+
+        if (mssfix!=null) {
+            if (mssfix.size()>=2) {
+                try {
+                    np.mMssFix=Integer.parseInt(mssfix.get(1));
+                } catch(NumberFormatException e) {
+                    throw new ConfigParseError("Argument to --mssfix has to be an integer");
+                }
+            } else {
+                np.mMssFix = VpnProfile.DEFAULT_MSSFIX_SIZE;
+            }
+        }
 
 
 		Vector<String> mode =getOption("mode",1,1);
diff --git a/app/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java b/app/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java
index 18c5f1d9..0126d08e 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java
@@ -68,7 +68,7 @@ public class DeviceStateReceiver extends BroadcastReceiver implements ByteCountL
         if (windowtraffic < TRAFFIC_LIMIT) {
             screen = connectState.DISCONNECTED;
             VpnStatus.logInfo(R.string.screenoff_pause,
-                    OpenVpnService.humanReadableByteCount(TRAFFIC_LIMIT, false), TRAFFIC_WINDOW);
+                    OpenVPNService.humanReadableByteCount(TRAFFIC_LIMIT, false), TRAFFIC_WINDOW);
 
             mManagement.pause(getPauseReason());
         }
diff --git a/app/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java b/app/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java
index 1daa3433..485e5369 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java
@@ -1,14 +1,37 @@
 package de.blinkt.openvpn.core;
-
 import android.app.Application;
 
-/**
- * Created by arne on 28.12.13.
- */
+/*
+import org.acra.ACRA;
+import org.acra.ReportingInteractionMode;
+import org.acra.annotation.ReportsCrashes;
+*/
+
+import se.leap.bitmaskclient.BuildConfig;
+import se.leap.bitmaskclient.R;
+import de.blinkt.openvpn.core.PRNGFixes;
+
+/*
+@ReportsCrashes(
+        formKey = "",
+        formUri = "http://reports.blinkt.de/report-icsopenvpn",
+        reportType = org.acra.sender.HttpSender.Type.JSON,
+        httpMethod = org.acra.sender.HttpSender.Method.PUT,
+        formUriBasicAuthLogin="report-icsopenvpn",
+        formUriBasicAuthPassword="Tohd4neiF9Ai!!!!111eleven",
+        mode = ReportingInteractionMode.TOAST,
+        resToastText = R.string.crash_toast_text
+)
+*/
 public class ICSOpenVPNApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
         PRNGFixes.apply();
+
+        if (BuildConfig.DEBUG) {
+            //ACRA.init(this);
+        }
     }
+
 }
diff --git a/app/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java b/app/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java
index 81a17ef9..8c6cb1f5 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java
@@ -76,8 +76,8 @@ public class NetworkSpace {
 
             netAddress = BigInteger.ZERO;
             for (byte b : address.getAddress()) {
-                s -= 16;
-                netAddress = netAddress.add(BigInteger.valueOf(b).shiftLeft(s));
+                s -= 8;
+                netAddress = netAddress.add(BigInteger.valueOf((b & 0xFF)).shiftLeft(s));
             }
         }
 
@@ -152,12 +152,12 @@ public class NetworkSpace {
         String getIPv6Address() {
             if (BuildConfig.DEBUG) Assert.assertTrue (!isV4);
             BigInteger r = netAddress;
-            if (r.longValue() == 0)
+            if (r.compareTo(BigInteger.ZERO)==0 && networkMask==0)
                 return "::";
 
             Vector<String> parts = new Vector<String>();
             while (r.compareTo(BigInteger.ZERO) == 1) {
-                parts.add(0, String.format(Locale.US, "%x", r.mod(BigInteger.valueOf(256)).longValue()));
+                parts.add(0, String.format(Locale.US, "%x", r.mod(BigInteger.valueOf(0x10000)).longValue()));
                 r = r.shiftRight(16);
             }
 
diff --git a/app/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
index 0cf93de3..743e7cc5 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
@@ -40,14 +40,14 @@ import de.blinkt.openvpn.core.VpnStatus.StateListener;
 
 import static de.blinkt.openvpn.core.NetworkSpace.ipAddress;
 import static de.blinkt.openvpn.core.VpnStatus.ConnectionStatus.LEVEL_CONNECTED;
-import static de.blinkt.openvpn.core.VpnStatus.ConnectionStatus.LEVEL_CONNECTING_SERVER_REPLIED;
 import static de.blinkt.openvpn.core.VpnStatus.ConnectionStatus.LEVEL_NONETWORK;
+import static de.blinkt.openvpn.core.VpnStatus.ConnectionStatus.LEVEL_NOTCONNECTED;
 import static de.blinkt.openvpn.core.VpnStatus.ConnectionStatus.LEVEL_CONNECTING_NO_SERVER_REPLY_YET;
 import static de.blinkt.openvpn.core.VpnStatus.ConnectionStatus.LEVEL_WAITING_FOR_USER_INPUT;
-
 import se.leap.bitmaskclient.Dashboard;
 
-public class OpenVpnService extends VpnService implements StateListener, Callback, ByteCountListener {
+public class OpenVPNService extends VpnService implements StateListener, Callback, ByteCountListener {
+
     public static final String START_SERVICE = "de.blinkt.openvpn.START_SERVICE";
     public static final String START_SERVICE_STICKY = "de.blinkt.openvpn.START_SERVICE_STICKY";
     public static final String ALWAYS_SHOW_NOTIFICATION = "de.blinkt.openvpn.NOTIFICATION_ALWAYS_VISIBLE";
@@ -74,7 +74,7 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
     private OpenVPNManagement mManagement;
     private String mLastTunCfg;
     private String mRemoteGW;
-    private Object mProcessLock = new Object();
+    private final Object mProcessLock = new Object();
 
     // From: http://stackoverflow.com/questions/3758606/how-to-convert-byte-size-into-human-readable-format-in-java
     public static String humanReadableByteCount(long bytes, boolean mbit) {
@@ -116,6 +116,7 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
         synchronized (mProcessLock) {
             mProcessThread = null;
         }
+	mConnecttime = 0;
         VpnStatus.removeByteCountListener(this);
         unregisterDeviceStateReceiver();
         ProfileManager.setConntectedVpnProfileDisconnected(this);
@@ -166,7 +167,7 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
 
 
         mNotificationManager.notify(OPENVPN_STATUS, notification);
-        // startForeground(OPENVPN_STATUS, notification);
+        //startForeground(OPENVPN_STATUS, notification);
     }
 
     private int getIconByConnectionStatus(ConnectionStatus level) {
@@ -212,7 +213,7 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
             nbuilder.addAction(android.R.drawable.ic_menu_close_clear_cancel,
                     getString(R.string.cancel_connection), disconnectPendingIntent);
 
-            Intent pauseVPN = new Intent(this, OpenVpnService.class);
+            Intent pauseVPN = new Intent(this, OpenVPNService.class);
             if (mDeviceStateReceiver == null || !mDeviceStateReceiver.isUserPaused()) {
                 pauseVPN.setAction(PAUSE_VPN);
                 PendingIntent pauseVPNPending = PendingIntent.getService(this, 0, pauseVPN, 0);
@@ -308,23 +309,32 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
             return START_REDELIVER_INTENT;
         }
 
-        if (intent == null)
-            return START_NOT_STICKY;
-
+	String UUID = "UUID";
+        if (intent == null) {
+	    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+	    android.util.Log.d("bitmaskclient", "UUID is " + prefs.getString(UUID, ""));
+	    mProfile = ProfileManager.get(this, prefs.getString(UUID, ""));
+	    android.util.Log.d("bitmaskclient", "mProfile is null? " + (mProfile == null));
+	    if(mProfile != null)
+		intent = mProfile.prepareIntent(getBaseContext());
+	    else
+                return START_NOT_STICKY;
+	}
+	if(mProfile != null)
+	    android.util.Log.d("bitmaskclient", "mProfile != null");
         // Extract information from the intent.
         String prefix = getPackageName();
         String[] argv = intent.getStringArrayExtra(prefix + ".ARGV");
         String nativelibdir = intent.getStringExtra(prefix + ".nativelib");
-        String profileUUID = intent.getStringExtra(prefix + ".profileUUID");
+        String profileUUID = intent.getStringExtra(prefix + ".profileUUID");	
 
         mProfile = ProfileManager.get(this, profileUUID);
 
-
         String startTitle = getString(R.string.start_vpn_title, mProfile.mName);
         String startTicker = getString(R.string.start_vpn_ticker, mProfile.mName);
         showNotification(startTitle, startTicker,
                 false, 0, LEVEL_CONNECTING_NO_SERVER_REPLY_YET);
-	
+
         // Set a flag that we are starting a new VPN
         mStarting = true;
         // Stop the previous session by interrupting the thread.
@@ -351,12 +361,13 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
 
         // Start a new session by creating a new thread.
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-
+	
         mOvpn3 = prefs.getBoolean("ovpn3", false);
         if (!"ovpn3".equals(BuildConfig.FLAVOR))
             mOvpn3 = false;
 
 
+	prefs.edit().putString(UUID, profileUUID).commit();
         // Open the Management Interface
         if (!mOvpn3) {
 
@@ -399,13 +410,16 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
 
         ProfileManager.setConnectedVpnProfile(this, mProfile);
 
-        return START_NOT_STICKY;
+        if (mProfile.mPersistTun)
+            return START_STICKY;
+	else
+	    return START_NOT_STICKY;
     }
 
     private OpenVPNManagement instantiateOpenVPN3Core() {
         try {
             Class cl = Class.forName("de.blinkt.openvpn.core.OpenVPNThreadv3");
-            return (OpenVPNManagement) cl.getConstructor(OpenVpnService.class,VpnProfile.class).newInstance(this,mProfile);
+            return (OpenVPNManagement) cl.getConstructor(OpenVPNService.class,VpnProfile.class).newInstance(this,mProfile);
         } catch (IllegalArgumentException e) {
             e.printStackTrace();
         } catch (InstantiationException e) {
@@ -499,8 +513,15 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
             }
         }
 
-
-        builder.setMtu(mMtu);
+        String release = Build.VERSION.RELEASE;
+        if ((Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT && !release.startsWith("4.4.3")
+                &&  !release.startsWith("4.4.4") &&  !release.startsWith("4.4.5") && !release.startsWith("4.4.6"))
+                && mMtu < 1280) {
+            VpnStatus.logInfo(String.format("Forcing MTU to 1280 instead of %d to workaround Android Bug #70916", mMtu));
+            builder.setMtu(1280);
+        } else {
+            builder.setMtu(mMtu);
+        }
 
         Collection<ipAddress> positiveIPv4Routes = mRoutes.getPositiveIPList();
         Collection<ipAddress> positiveIPv6Routes = mRoutesv6.getPositiveIPList();
@@ -702,23 +723,32 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
                 mDisplayBytecount = true;
                 mConnecttime = System.currentTimeMillis();
                 lowpriority = true;
-		NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-		mNotificationManager.cancel(OPENVPN_STATUS);
-            } else if(!mProfile.mPersistTun || mConnecttime == 0){
-                mDisplayBytecount = false;
-		String msg = getString(resid);
-		String ticker = msg;
-		showNotification(msg + " " + logmessage, ticker, lowpriority , 0, level);
-            } else if(mProfile.mPersistTun && level == LEVEL_NONETWORK) {
-		NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-		mNotificationManager.cancel(OPENVPN_STATUS);
-	    } else if(mProfile.mPersistTun && mConnecttime > 0) {
+		if(mProfile.mPersistTun) {
+		    NotificationManager ns = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+		    ns.cancel(OPENVPN_STATUS);
+		    return;
+		}
+	    } else if (level == LEVEL_NONETWORK || level == LEVEL_NOTCONNECTED) {
+		NotificationManager ns = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+		ns.cancel(OPENVPN_STATUS);
+		return;
+	    } else if (level != LEVEL_NOTCONNECTED && mConnecttime > 0) {
                 mDisplayBytecount = false;
 		String msg = "Traffic is blocked until the VPN becomes active.";
-		String ticker = msg;		
+		String ticker = msg;
 		showNotification(msg, ticker, lowpriority , 0, level);
-	    }
+		return;
+	    } else {
+                mDisplayBytecount = false;
+            }
 
+            // Other notifications are shown,
+            // This also mean we are no longer connected, ignore bytecount messages until next
+            // CONNECTED
+            // Does not work :(
+            String msg = getString(resid);
+            String ticker = msg;
+            showNotification(msg + " " + logmessage, ticker, lowpriority , 0, level);
         }
     }
 
@@ -738,6 +768,9 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
                     humanReadableByteCount(diffIn / OpenVPNManagement.mBytecountInterval, true),
                     humanReadableByteCount(out, false),
                     humanReadableByteCount(diffOut / OpenVPNManagement.mBytecountInterval, true));
+
+            boolean lowpriority = !mNotificationAlwaysVisible;
+            //showNotification(netstat, null, lowpriority, mConnecttime, LEVEL_CONNECTED);
         }
 
     }
@@ -773,9 +806,9 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
     }
 
     public class LocalBinder extends Binder {
-        public OpenVpnService getService() {
+        public OpenVPNService getService() {
             // Return this instance of LocalService so clients can call public methods
-            return OpenVpnService.this;
+            return OpenVPNService.this;
         }
     }
 }
diff --git a/app/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
index 67c05e7d..5fa2ab9e 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
@@ -33,11 +33,11 @@ public class OpenVPNThread implements Runnable {
     private String[] mArgv;
 	private Process mProcess;
 	private String mNativeDir;
-	private OpenVpnService mService;
+	private OpenVPNService mService;
 	private String mDumpPath;
 	private Map<String, String> mProcessEnv;
 
-	public OpenVPNThread(OpenVpnService service,String[] argv, Map<String,String> processEnv, String nativelibdir)
+	public OpenVPNThread(OpenVPNService service,String[] argv, Map<String,String> processEnv, String nativelibdir)
 	{
 		mArgv = argv;
 		mNativeDir = nativelibdir;
diff --git a/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java b/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
index e6e5be25..e200f210 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
@@ -33,49 +33,50 @@ import de.blinkt.openvpn.core.VpnStatus.ConnectionStatus;
 
 public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
 
-	private static final String TAG = "openvpn";
-	private LocalSocket mSocket;
-	private VpnProfile mProfile;
-	private OpenVpnService mOpenVPNService;
-	private LinkedList<FileDescriptor> mFDList=new LinkedList<FileDescriptor>();
+    private static final String TAG = "openvpn";
+    private LocalSocket mSocket;
+    private VpnProfile mProfile;
+    private OpenVPNService mOpenVPNService;
+    private LinkedList<FileDescriptor> mFDList = new LinkedList<FileDescriptor>();
     private LocalServerSocket mServerSocket;
-	private boolean mReleaseHold=true;
-	private boolean mWaitingForRelease=false;
-	private long mLastHoldRelease=0;
+    private boolean mReleaseHold = true;
+    private boolean mWaitingForRelease = false;
+    private long mLastHoldRelease = 0;
 
-	private static Vector<OpenVpnManagementThread> active=new Vector<OpenVpnManagementThread>();
+    private static final Vector<OpenVpnManagementThread> active = new Vector<OpenVpnManagementThread>();
     private LocalSocket mServerSocketLocal;
 
     private pauseReason lastPauseReason = pauseReason.noNetwork;
 
-    public OpenVpnManagementThread(VpnProfile profile, OpenVpnService openVpnService) {
-		mProfile = profile;
-		mOpenVPNService = openVpnService;
-		
+    public OpenVpnManagementThread(VpnProfile profile, OpenVPNService openVpnService) {
+        mProfile = profile;
+        mOpenVPNService = openVpnService;
 
-		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(openVpnService);
-		boolean managemeNetworkState = prefs.getBoolean("netchangereconnect", true);
-		if(managemeNetworkState)
-			mReleaseHold=false;
 
-	}
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(openVpnService);
+        boolean managemeNetworkState = prefs.getBoolean("netchangereconnect", true);
+        if (managemeNetworkState)
+            mReleaseHold = false;
+
+    }
 
     public boolean openManagementInterface(@NotNull Context c) {
         // Could take a while to open connection
-        int tries=8;
+        int tries = 8;
 
-        String socketName = (c.getCacheDir().getAbsolutePath() + "/" +  "mgmtsocket");
+        String socketName = (c.getCacheDir().getAbsolutePath() + "/" + "mgmtsocket");
         // The mServerSocketLocal is transferred to the LocalServerSocket, ignore warning
 
         mServerSocketLocal = new LocalSocket();
 
-        while(tries > 0 && !mServerSocketLocal.isConnected()) {
+        while (tries > 0 && !mServerSocketLocal.isConnected()) {
             try {
                 mServerSocketLocal.bind(new LocalSocketAddress(socketName,
                         LocalSocketAddress.Namespace.FILESYSTEM));
             } catch (IOException e) {
                 // wait 300 ms before retrying
-                try { Thread.sleep(300);
+                try {
+                    Thread.sleep(300);
                 } catch (InterruptedException e1) {
                 }
 
@@ -95,165 +96,168 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
 
     }
 
-	public void managmentCommand(String cmd) {
+    public void managmentCommand(String cmd) {
         try {
-		    if(mSocket!=null && mSocket.getOutputStream() !=null) {
-				mSocket.getOutputStream().write(cmd.getBytes());
-				mSocket.getOutputStream().flush();
-			}
-        }catch (IOException e) {
-				// Ignore socket stack traces
+            if (mSocket != null && mSocket.getOutputStream() != null) {
+                mSocket.getOutputStream().write(cmd.getBytes());
+                mSocket.getOutputStream().flush();
+            }
+        } catch (IOException e) {
+            // Ignore socket stack traces
         }
-	}
+    }
 
 
-	@Override
-	public void run() {
-		byte [] buffer  =new byte[2048];
-		//	mSocket.setSoTimeout(5); // Setting a timeout cannot be that bad
+    @Override
+    public void run() {
+        byte[] buffer = new byte[2048];
+        //	mSocket.setSoTimeout(5); // Setting a timeout cannot be that bad
 
-		String pendingInput="";
-		active.add(this);
+        String pendingInput = "";
+        synchronized (active) {
+            active.add(this);
+        }
 
-		try {
-			// Wait for a client to connect
-			mSocket= mServerSocket.accept();
-			InputStream instream = mSocket.getInputStream();
+        try {
+            // Wait for a client to connect
+            mSocket = mServerSocket.accept();
+            InputStream instream = mSocket.getInputStream();
             // Close the management socket after client connected
 
             mServerSocket.close();
             // Closing one of the two sockets also closes the other
             //mServerSocketLocal.close();
 
-			while(true) {
-				int numbytesread = instream.read(buffer);
-				if(numbytesread==-1)
-					return;
-
-				FileDescriptor[] fds = null;
-				try {
-					fds = mSocket.getAncillaryFileDescriptors();
-				} catch (IOException e) {
-					VpnStatus.logException("Error reading fds from socket", e);
-				}
-				if(fds!=null){
-                    Collections.addAll(mFDList, fds);
-				}
+            while (true) {
+                int numbytesread = instream.read(buffer);
+                if (numbytesread == -1)
+                    return;
 
-				String input = new String(buffer,0,numbytesread,"UTF-8");
+                FileDescriptor[] fds = null;
+                try {
+                    fds = mSocket.getAncillaryFileDescriptors();
+                } catch (IOException e) {
+                    VpnStatus.logException("Error reading fds from socket", e);
+                }
+                if (fds != null) {
+                    Collections.addAll(mFDList, fds);
+                }
 
-				pendingInput += input;
+                String input = new String(buffer, 0, numbytesread, "UTF-8");
 
-				pendingInput=processInput(pendingInput);
+                pendingInput += input;
 
+                pendingInput = processInput(pendingInput);
 
 
-			}
-		} catch (IOException e) {
+            }
+        } catch (IOException e) {
             if (!e.getMessage().equals("socket closed"))
                 VpnStatus.logException(e);
-		}
-		active.remove(this);
-	}
+        }
+        synchronized (active) {
+            active.remove(this);
+        }
+    }
 
-	//! Hack O Rama 2000!
-	private void protectFileDescriptor(FileDescriptor fd) {
-		Exception exp;
-		try {
-			Method getInt =  FileDescriptor.class.getDeclaredMethod("getInt$");
-			int fdint = (Integer) getInt.invoke(fd);
+    //! Hack O Rama 2000!
+    private void protectFileDescriptor(FileDescriptor fd) {
+        Exception exp;
+        try {
+            Method getInt = FileDescriptor.class.getDeclaredMethod("getInt$");
+            int fdint = (Integer) getInt.invoke(fd);
 
-			// You can even get more evil by parsing toString() and extract the int from that :)
+            // You can even get more evil by parsing toString() and extract the int from that :)
 
-			boolean result = mOpenVPNService.protect(fdint);
+            boolean result = mOpenVPNService.protect(fdint);
             if (!result)
                 VpnStatus.logWarning("Could not protect VPN socket");
 
 
-			//ParcelFileDescriptor pfd = ParcelFileDescriptor.fromFd(fdint);
-			//pfd.close();
-			NativeUtils.jniclose(fdint);
-			return;
-		} catch (NoSuchMethodException e) {
-			exp =e;
-		} catch (IllegalArgumentException e) {
-			exp =e;
-		} catch (IllegalAccessException e) {
-			exp =e;
-		} catch (InvocationTargetException e) {
-			exp =e;
-		} catch (NullPointerException e) {
-			exp =e;
-		}
+            //ParcelFileDescriptor pfd = ParcelFileDescriptor.fromFd(fdint);
+            //pfd.close();
+            NativeUtils.jniclose(fdint);
+            return;
+        } catch (NoSuchMethodException e) {
+            exp = e;
+        } catch (IllegalArgumentException e) {
+            exp = e;
+        } catch (IllegalAccessException e) {
+            exp = e;
+        } catch (InvocationTargetException e) {
+            exp = e;
+        } catch (NullPointerException e) {
+            exp = e;
+        }
 
         Log.d("Openvpn", "Failed to retrieve fd from socket: " + fd);
-        VpnStatus.logException("Failed to retrieve fd from socket (" + fd + ")" , exp);
-	}
+        VpnStatus.logException("Failed to retrieve fd from socket (" + fd + ")", exp);
+    }
 
-	private String processInput(String pendingInput) {
+    private String processInput(String pendingInput) {
 
 
-		while(pendingInput.contains("\n")) {
-			String[] tokens = pendingInput.split("\\r?\\n", 2);
-			processCommand(tokens[0]);
-			if(tokens.length == 1)
-				// No second part, newline was at the end
-				pendingInput="";
-			else
-				pendingInput=tokens[1];
-		}
-		return pendingInput;
-	}
+        while (pendingInput.contains("\n")) {
+            String[] tokens = pendingInput.split("\\r?\\n", 2);
+            processCommand(tokens[0]);
+            if (tokens.length == 1)
+                // No second part, newline was at the end
+                pendingInput = "";
+            else
+                pendingInput = tokens[1];
+        }
+        return pendingInput;
+    }
 
 
-	private void processCommand(String command) {
+    private void processCommand(String command) {
         //Log.i(TAG, "Line from managment" + command);
 
 
         if (command.startsWith(">") && command.contains(":")) {
-			String[] parts = command.split(":",2);
-			String cmd = parts[0].substring(1);
-			String argument = parts[1];
+            String[] parts = command.split(":", 2);
+            String cmd = parts[0].substring(1);
+            String argument = parts[1];
 
 
-			if(cmd.equals("INFO")) {
-				/* Ignore greeting from management */
+            if (cmd.equals("INFO")) {
+                /* Ignore greeting from management */
                 return;
-			}else if (cmd.equals("PASSWORD")) {
-				processPWCommand(argument);
-			} else if (cmd.equals("HOLD")) {
-				handleHold();
-			} else if (cmd.equals("NEED-OK")) {
-				processNeedCommand(argument);
-			} else if (cmd.equals("BYTECOUNT")){
-				processByteCount(argument);
-			} else if (cmd.equals("STATE")) {
-				processState(argument);
-			} else if (cmd.equals("PROXY")) {
-				processProxyCMD(argument);
-			} else if (cmd.equals("LOG")) {
-                 processLogMessage(argument);
-			} else if (cmd.equals("RSA_SIGN")) {
-				processSignCommand(argument);
-			} else {
-				VpnStatus.logWarning("MGMT: Got unrecognized command" + command);
-				Log.i(TAG, "Got unrecognized command" + command);
-			}
-		} else if (command.startsWith("SUCCESS:")) {
+            } else if (cmd.equals("PASSWORD")) {
+                processPWCommand(argument);
+            } else if (cmd.equals("HOLD")) {
+                handleHold();
+            } else if (cmd.equals("NEED-OK")) {
+                processNeedCommand(argument);
+            } else if (cmd.equals("BYTECOUNT")) {
+                processByteCount(argument);
+            } else if (cmd.equals("STATE")) {
+                processState(argument);
+            } else if (cmd.equals("PROXY")) {
+                processProxyCMD(argument);
+            } else if (cmd.equals("LOG")) {
+                processLogMessage(argument);
+            } else if (cmd.equals("RSA_SIGN")) {
+                processSignCommand(argument);
+            } else {
+                VpnStatus.logWarning("MGMT: Got unrecognized command" + command);
+                Log.i(TAG, "Got unrecognized command" + command);
+            }
+        } else if (command.startsWith("SUCCESS:")) {
 			/* Ignore this kind of message too */
             return;
         } else if (command.startsWith("PROTECTFD: ")) {
             FileDescriptor fdtoprotect = mFDList.pollFirst();
-            if (fdtoprotect!=null)
+            if (fdtoprotect != null)
                 protectFileDescriptor(fdtoprotect);
-		} else {
-			Log.i(TAG, "Got unrecognized line from managment" + command);
-			VpnStatus.logWarning("MGMT: Got unrecognized line from management:" + command);
-		}
-	}
+        } else {
+            Log.i(TAG, "Got unrecognized line from managment" + command);
+            VpnStatus.logWarning("MGMT: Got unrecognized line from management:" + command);
+        }
+    }
 
     private void processLogMessage(String argument) {
-        String[] args = argument.split(",",4);
+        String[] args = argument.split(",", 4);
         // 0 unix time stamp
         // 1 log level N,I,E etc.
                 /*
@@ -287,109 +291,110 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
         if (msg.startsWith("MANAGEMENT: CMD"))
             ovpnlevel = Math.max(4, ovpnlevel);
 
-        VpnStatus.logMessageOpenVPN(level,ovpnlevel, msg);
+        VpnStatus.logMessageOpenVPN(level, ovpnlevel, msg);
     }
 
     private void handleHold() {
-		if(mReleaseHold) {
-			releaseHoldCmd();
-		} else { 
-			mWaitingForRelease=true;
+        if (mReleaseHold) {
+            releaseHoldCmd();
+        } else {
+            mWaitingForRelease = true;
 
             VpnStatus.updateStatePause(lastPauseReason);
 
 
-		}
-	}
-	private void releaseHoldCmd() {
-		if ((System.currentTimeMillis()- mLastHoldRelease) < 5000) {
-			try {
-				Thread.sleep(3000);
-			} catch (InterruptedException e) {
+        }
+    }
+
+    private void releaseHoldCmd() {
+        if ((System.currentTimeMillis() - mLastHoldRelease) < 5000) {
+            try {
+                Thread.sleep(3000);
+            } catch (InterruptedException ignored) {
             }
-			
-		}
-		mWaitingForRelease=false;
-		mLastHoldRelease  = System.currentTimeMillis();
-		managmentCommand("hold release\n");
-		managmentCommand("bytecount " + mBytecountInterval + "\n");
+
+        }
+        mWaitingForRelease = false;
+        mLastHoldRelease = System.currentTimeMillis();
+        managmentCommand("hold release\n");
+        managmentCommand("bytecount " + mBytecountInterval + "\n");
         managmentCommand("state on\n");
         //managmentCommand("log on all\n");
-	}
-	
-	public void releaseHold() {
-		mReleaseHold=true;
-		if(mWaitingForRelease)
-			releaseHoldCmd();
-			
-	}
-
-	private void processProxyCMD(String argument) {
-		String[] args = argument.split(",",3);
-		SocketAddress proxyaddr = ProxyDetection.detectProxy(mProfile);
-
-		
-		if(args.length >= 2) {
-			String proto = args[1];
-			if(proto.equals("UDP")) {
-				proxyaddr=null;
-			}
-		}
-
-		if(proxyaddr instanceof InetSocketAddress ){
-			InetSocketAddress isa = (InetSocketAddress) proxyaddr;
-			
-			VpnStatus.logInfo(R.string.using_proxy, isa.getHostName(), isa.getPort());
-			
-			String proxycmd = String.format(Locale.ENGLISH,"proxy HTTP %s %d\n", isa.getHostName(),isa.getPort());
-			managmentCommand(proxycmd);
-		} else {
-			managmentCommand("proxy NONE\n");
-		}
-
-	}
-	private void processState(String argument) {
-		String[] args = argument.split(",",3);
-		String currentstate = args[1];
-
-		if(args[2].equals(",,"))
-			VpnStatus.updateStateString(currentstate, "");
-		else
-			VpnStatus.updateStateString(currentstate, args[2]);
-	}
-
-
-	private void processByteCount(String argument) {
-		//   >BYTECOUNT:{BYTES_IN},{BYTES_OUT}
-		int comma = argument.indexOf(',');
-		long in = Long.parseLong(argument.substring(0, comma));
-		long out = Long.parseLong(argument.substring(comma+1));
-
-		VpnStatus.updateByteCount(in, out);
-		
-	}
-
-
-
-	private void processNeedCommand(String argument) {
-		int p1 =argument.indexOf('\'');
-		int p2 = argument.indexOf('\'',p1+1);
-
-		String needed = argument.substring(p1+1, p2);
-		String extra = argument.split(":",2)[1];
-
-		String status = "ok";
-
-
-		if (needed.equals("PROTECTFD")) {
-			FileDescriptor fdtoprotect = mFDList.pollFirst();
-			protectFileDescriptor(fdtoprotect);
-		} else if (needed.equals("DNSSERVER")) {
-			mOpenVPNService.addDNS(extra);
-		}else if (needed.equals("DNSDOMAIN")){
-			mOpenVPNService.setDomain(extra);
-		} else if (needed.equals("ROUTE")) {
-			String[] routeparts = extra.split(" ");
+    }
+
+    public void releaseHold() {
+        mReleaseHold = true;
+        if (mWaitingForRelease)
+            releaseHoldCmd();
+
+    }
+
+    private void processProxyCMD(String argument) {
+        String[] args = argument.split(",", 3);
+        SocketAddress proxyaddr = ProxyDetection.detectProxy(mProfile);
+
+
+        if (args.length >= 2) {
+            String proto = args[1];
+            if (proto.equals("UDP")) {
+                proxyaddr = null;
+            }
+        }
+
+        if (proxyaddr instanceof InetSocketAddress) {
+            InetSocketAddress isa = (InetSocketAddress) proxyaddr;
+
+            VpnStatus.logInfo(R.string.using_proxy, isa.getHostName(), isa.getPort());
+
+            String proxycmd = String.format(Locale.ENGLISH, "proxy HTTP %s %d\n", isa.getHostName(), isa.getPort());
+            managmentCommand(proxycmd);
+        } else {
+            managmentCommand("proxy NONE\n");
+        }
+
+    }
+
+    private void processState(String argument) {
+        String[] args = argument.split(",", 3);
+        String currentstate = args[1];
+
+        if (args[2].equals(",,"))
+            VpnStatus.updateStateString(currentstate, "");
+        else
+            VpnStatus.updateStateString(currentstate, args[2]);
+    }
+
+
+    private void processByteCount(String argument) {
+        //   >BYTECOUNT:{BYTES_IN},{BYTES_OUT}
+        int comma = argument.indexOf(',');
+        long in = Long.parseLong(argument.substring(0, comma));
+        long out = Long.parseLong(argument.substring(comma + 1));
+
+        VpnStatus.updateByteCount(in, out);
+
+    }
+
+
+    private void processNeedCommand(String argument) {
+        int p1 = argument.indexOf('\'');
+        int p2 = argument.indexOf('\'', p1 + 1);
+
+        String needed = argument.substring(p1 + 1, p2);
+        String extra = argument.split(":", 2)[1];
+
+        String status = "ok";
+
+
+        if (needed.equals("PROTECTFD")) {
+            FileDescriptor fdtoprotect = mFDList.pollFirst();
+            protectFileDescriptor(fdtoprotect);
+        } else if (needed.equals("DNSSERVER")) {
+            mOpenVPNService.addDNS(extra);
+        } else if (needed.equals("DNSDOMAIN")) {
+            mOpenVPNService.setDomain(extra);
+        } else if (needed.equals("ROUTE")) {
+            String[] routeparts = extra.split(" ");
 
             /*
             buf_printf (&out, "%s %s %s dev %s", network, netmask, gateway, rgi->iface);
@@ -397,209 +402,208 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
             buf_printf (&out, "%s %s %s", network, netmask, gateway);
             */
 
-            if(routeparts.length==5) {
+            if (routeparts.length == 5) {
                 if (BuildConfig.DEBUG) Assert.assertEquals("dev", routeparts[3]);
                 mOpenVPNService.addRoute(routeparts[0], routeparts[1], routeparts[2], routeparts[4]);
-            }  else if (routeparts.length >= 3) {
+            } else if (routeparts.length >= 3) {
                 mOpenVPNService.addRoute(routeparts[0], routeparts[1], routeparts[2], null);
             } else {
                 VpnStatus.logError("Unrecognized ROUTE cmd:" + Arrays.toString(routeparts) + " | " + argument);
             }
 
-		} else if (needed.equals("ROUTE6")) {
+        } else if (needed.equals("ROUTE6")) {
             String[] routeparts = extra.split(" ");
-			mOpenVPNService.addRoutev6(routeparts[0],routeparts[1]);
-		} else if (needed.equals("IFCONFIG")) {
-			String[] ifconfigparts = extra.split(" ");
-			int mtu = Integer.parseInt(ifconfigparts[2]);
-			mOpenVPNService.setLocalIP(ifconfigparts[0], ifconfigparts[1],mtu,ifconfigparts[3]);
-		} else if (needed.equals("IFCONFIG6")) {
-			mOpenVPNService.setLocalIPv6(extra);
-
-		} else if (needed.equals("PERSIST_TUN_ACTION")) {
+            mOpenVPNService.addRoutev6(routeparts[0], routeparts[1]);
+        } else if (needed.equals("IFCONFIG")) {
+            String[] ifconfigparts = extra.split(" ");
+            int mtu = Integer.parseInt(ifconfigparts[2]);
+            mOpenVPNService.setLocalIP(ifconfigparts[0], ifconfigparts[1], mtu, ifconfigparts[3]);
+        } else if (needed.equals("IFCONFIG6")) {
+            mOpenVPNService.setLocalIPv6(extra);
+
+        } else if (needed.equals("PERSIST_TUN_ACTION")) {
             // check if tun cfg stayed the same
             status = mOpenVPNService.getTunReopenStatus();
         } else if (needed.equals("OPENTUN")) {
-			if(sendTunFD(needed,extra))
-				return;
-			else
-				status="cancel";
-			// This not nice or anything but setFileDescriptors accepts only FilDescriptor class :(
-
-		} else {
-			Log.e(TAG,"Unkown needok command " + argument);
-			return;
-		}
-
-		String cmd = String.format("needok '%s' %s\n", needed, status);
-		managmentCommand(cmd);
-	}
-
-	private boolean sendTunFD (String needed, String extra) {
-		Exception exp;
-		if(!extra.equals("tun")) {
-			// We only support tun
-			VpnStatus.logError(String.format("Device type %s requested, but only tun is possible with the Android API, sorry!",extra));
-
-			return false;
-		}
-		ParcelFileDescriptor pfd = mOpenVPNService.openTun();
-		if(pfd==null)
-			return false;
-
-		Method setInt;
-		int fdint = pfd.getFd();
-		try {
-			setInt = FileDescriptor.class.getDeclaredMethod("setInt$",int.class);
-			FileDescriptor fdtosend = new FileDescriptor();
-
-			setInt.invoke(fdtosend,fdint);
-
-			FileDescriptor[] fds = {fdtosend};
-			mSocket.setFileDescriptorsForSend(fds);
-
-			// Trigger a send so we can close the fd on our side of the channel
-			// The API documentation fails to mention that it will not reset the file descriptor to
-			// be send and will happily send the file descriptor on every write ...
-			String cmd = String.format("needok '%s' %s\n", needed, "ok");
-			managmentCommand(cmd);
-
-			// Set the FileDescriptor to null to stop this mad behavior 
-			mSocket.setFileDescriptorsForSend(null);
-
-			pfd.close();			
-
-			return true;
-		} catch (NoSuchMethodException e) {
-			exp =e;
-		} catch (IllegalArgumentException e) {
-			exp =e;
-		} catch (IllegalAccessException e) {
-			exp =e;
-		} catch (InvocationTargetException e) {
-			exp =e;
-		} catch (IOException e) {
-			exp =e;
-		}
-        VpnStatus.logException("Could not send fd over socket" , exp);
+            if (sendTunFD(needed, extra))
+                return;
+            else
+                status = "cancel";
+            // This not nice or anything but setFileDescriptors accepts only FilDescriptor class :(
+
+        } else {
+            Log.e(TAG, "Unkown needok command " + argument);
+            return;
+        }
+
+        String cmd = String.format("needok '%s' %s\n", needed, status);
+        managmentCommand(cmd);
+    }
+
+    private boolean sendTunFD(String needed, String extra) {
+        Exception exp;
+        if (!extra.equals("tun")) {
+            // We only support tun
+            VpnStatus.logError(String.format("Device type %s requested, but only tun is possible with the Android API, sorry!", extra));
+
+            return false;
+        }
+        ParcelFileDescriptor pfd = mOpenVPNService.openTun();
+        if (pfd == null)
+            return false;
+
+        Method setInt;
+        int fdint = pfd.getFd();
+        try {
+            setInt = FileDescriptor.class.getDeclaredMethod("setInt$", int.class);
+            FileDescriptor fdtosend = new FileDescriptor();
+
+            setInt.invoke(fdtosend, fdint);
+
+            FileDescriptor[] fds = {fdtosend};
+            mSocket.setFileDescriptorsForSend(fds);
+
+            // Trigger a send so we can close the fd on our side of the channel
+            // The API documentation fails to mention that it will not reset the file descriptor to
+            // be send and will happily send the file descriptor on every write ...
+            String cmd = String.format("needok '%s' %s\n", needed, "ok");
+            managmentCommand(cmd);
+
+            // Set the FileDescriptor to null to stop this mad behavior
+            mSocket.setFileDescriptorsForSend(null);
+
+            pfd.close();
+
+            return true;
+        } catch (NoSuchMethodException e) {
+            exp = e;
+        } catch (IllegalArgumentException e) {
+            exp = e;
+        } catch (IllegalAccessException e) {
+            exp = e;
+        } catch (InvocationTargetException e) {
+            exp = e;
+        } catch (IOException e) {
+            exp = e;
+        }
+        VpnStatus.logException("Could not send fd over socket", exp);
 
         return false;
-	}
-
-	private void processPWCommand(String argument) {
-		//argument has the form 	Need 'Private Key' password
-		// or  ">PASSWORD:Verification Failed: '%s' ['%s']"
-		String needed;
-		
-		
-		
-		try{
-
-			int p1 = argument.indexOf('\'');
-			int p2 = argument.indexOf('\'',p1+1);
-			needed = argument.substring(p1+1, p2);
-			if (argument.startsWith("Verification Failed")) {
-				proccessPWFailed(needed, argument.substring(p2+1));
-				return;
-			}
-		} catch (StringIndexOutOfBoundsException sioob) {
-			VpnStatus.logError("Could not parse management Password command: " + argument);
-			return;
-		}
-
-		String pw=null;
-
-		if(needed.equals("Private Key")) {
-			pw = mProfile.getPasswordPrivateKey();
-		} else if (needed.equals("Auth")) {
-			String usercmd = String.format("username '%s' %s\n", 
-					needed, VpnProfile.openVpnEscape(mProfile.mUsername));
-			managmentCommand(usercmd);
-			pw = mProfile.getPasswordAuth();
-		} 
-		if(pw!=null) {
-			String cmd = String.format("password '%s' %s\n", needed, VpnProfile.openVpnEscape(pw));
-			managmentCommand(cmd);
-		} else {
-			VpnStatus.logError(String.format("Openvpn requires Authentication type '%s' but no password/key information available", needed));
-		}
-
-	}
-
-
-
-
-	private void proccessPWFailed(String needed, String args) {
-		VpnStatus.updateStateString("AUTH_FAILED", needed + args, R.string.state_auth_failed, ConnectionStatus.LEVEL_AUTH_FAILED);
-	}
-
-
-	private static boolean stopOpenVPN() {
-		boolean sendCMD=false;
-		for (OpenVpnManagementThread mt: active){
-			mt.managmentCommand("signal SIGINT\n");
-			sendCMD=true;
-			try {
-				if(mt.mSocket !=null)
-					mt.mSocket.close();
-			} catch (IOException e) {
-				// Ignore close error on already closed socket
-			}
-		}
-		return sendCMD;		
-	}
+    }
+
+    private void processPWCommand(String argument) {
+        //argument has the form 	Need 'Private Key' password
+        // or  ">PASSWORD:Verification Failed: '%s' ['%s']"
+        String needed;
+
+
+        try {
+
+            int p1 = argument.indexOf('\'');
+            int p2 = argument.indexOf('\'', p1 + 1);
+            needed = argument.substring(p1 + 1, p2);
+            if (argument.startsWith("Verification Failed")) {
+                proccessPWFailed(needed, argument.substring(p2 + 1));
+                return;
+            }
+        } catch (StringIndexOutOfBoundsException sioob) {
+            VpnStatus.logError("Could not parse management Password command: " + argument);
+            return;
+        }
+
+        String pw = null;
+
+        if (needed.equals("Private Key")) {
+            pw = mProfile.getPasswordPrivateKey();
+        } else if (needed.equals("Auth")) {
+            String usercmd = String.format("username '%s' %s\n",
+                    needed, VpnProfile.openVpnEscape(mProfile.mUsername));
+            managmentCommand(usercmd);
+            pw = mProfile.getPasswordAuth();
+        }
+        if (pw != null) {
+            String cmd = String.format("password '%s' %s\n", needed, VpnProfile.openVpnEscape(pw));
+            managmentCommand(cmd);
+        } else {
+            VpnStatus.logError(String.format("Openvpn requires Authentication type '%s' but no password/key information available", needed));
+        }
+
+    }
+
+
+    private void proccessPWFailed(String needed, String args) {
+        VpnStatus.updateStateString("AUTH_FAILED", needed + args, R.string.state_auth_failed, ConnectionStatus.LEVEL_AUTH_FAILED);
+    }
+
+
+    private static boolean stopOpenVPN() {
+        synchronized (active) {
+            boolean sendCMD = false;
+            for (OpenVpnManagementThread mt : active) {
+                mt.managmentCommand("signal SIGINT\n");
+                sendCMD = true;
+                try {
+                    if (mt.mSocket != null)
+                        mt.mSocket.close();
+                } catch (IOException e) {
+                    // Ignore close error on already closed socket
+                }
+            }
+            return sendCMD;
+        }
+    }
 
     @Override
     public void networkChange() {
-        if(!mWaitingForRelease)
+        if (!mWaitingForRelease)
             managmentCommand("network-change\n");
     }
 
-	public void signalusr1() {
-		mReleaseHold=false;
+    public void signalusr1() {
+        mReleaseHold = false;
 
-		if(!mWaitingForRelease)
-			managmentCommand("signal SIGUSR1\n");
+        if (!mWaitingForRelease)
+            managmentCommand("signal SIGUSR1\n");
         else
             // If signalusr1 is called update the state string
             // if there is another for stopping
             VpnStatus.updateStatePause(lastPauseReason);
-	}
+    }
 
-	public void reconnect() {
-		signalusr1();
-		releaseHold();
-	}
+    public void reconnect() {
+        signalusr1();
+        releaseHold();
+    }
 
-	private void processSignCommand(String b64data) {
+    private void processSignCommand(String b64data) {
 
-		String signed_string = mProfile.getSignedData(b64data);
-        if(signed_string==null) {
+        String signed_string = mProfile.getSignedData(b64data);
+        if (signed_string == null) {
             managmentCommand("rsa-sig\n");
             managmentCommand("\nEND\n");
             stopOpenVPN();
             return;
         }
         managmentCommand("rsa-sig\n");
-		managmentCommand(signed_string);
+        managmentCommand(signed_string);
         managmentCommand("\nEND\n");
-	}
+    }
 
-	@Override
-	public void pause (pauseReason reason) {
+    @Override
+    public void pause(pauseReason reason) {
         lastPauseReason = reason;
-		signalusr1();
-	}
+        signalusr1();
+    }
 
-	@Override
-	public void resume() {
-		releaseHold();
+    @Override
+    public void resume() {
+        releaseHold();
         /* Reset the reason why we are disconnected */
         lastPauseReason = pauseReason.noNetwork;
-	}
+    }
 
-	@Override
-	public boolean stopVPN() {
-		return stopOpenVPN();
-	}
+    @Override
+    public boolean stopVPN() {
+        return stopOpenVPN();
+    }
 }
diff --git a/app/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java b/app/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
index 6e592121..ca850533 100644
--- a/app/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
+++ b/app/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
@@ -53,7 +53,7 @@ import se.leap.bitmaskclient.R;
 import de.blinkt.openvpn.VpnProfile;
 import de.blinkt.openvpn.activities.DisconnectVPN;
 import de.blinkt.openvpn.core.OpenVPNManagement;
-import de.blinkt.openvpn.core.OpenVpnService;
+import de.blinkt.openvpn.core.OpenVPNService;
 import de.blinkt.openvpn.core.ProfileManager;
 import de.blinkt.openvpn.core.VpnStatus;
 import de.blinkt.openvpn.core.VpnStatus.ConnectionStatus;
@@ -61,7 +61,7 @@ import de.blinkt.openvpn.core.VpnStatus.LogItem;
 import de.blinkt.openvpn.core.VpnStatus.LogListener;
 import de.blinkt.openvpn.core.VpnStatus.StateListener;
 
-import static de.blinkt.openvpn.core.OpenVpnService.humanReadableByteCount;
+import static de.blinkt.openvpn.core.OpenVPNService.humanReadableByteCount;
 
 import se.leap.bitmaskclient.Dashboard;
 
@@ -503,8 +503,8 @@ public class LogFragment extends ListFragment implements StateListener, SeekBar.
 		super.onResume();
 		VpnStatus.addStateListener(this);
         VpnStatus.addByteCountListener(this);
-        Intent intent = new Intent(getActivity(), OpenVpnService.class);
-        intent.setAction(OpenVpnService.START_SERVICE);
+        Intent intent = new Intent(getActivity(), OpenVPNService.class);
+        intent.setAction(OpenVPNService.START_SERVICE);
 
     }
 
diff --git a/app/src/main/java/se/leap/bitmaskclient/EIP.java b/app/src/main/java/se/leap/bitmaskclient/EIP.java
index 43ad3c1f..43fe0b7c 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EIP.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EIP.java
@@ -38,8 +38,8 @@ import de.blinkt.openvpn.activities.DisconnectVPN;
 import de.blinkt.openvpn.core.ConfigParser.ConfigParseError;
 import de.blinkt.openvpn.core.ConfigParser;
 import de.blinkt.openvpn.core.OpenVpnManagementThread;
-import de.blinkt.openvpn.core.OpenVpnService.LocalBinder;
-import de.blinkt.openvpn.core.OpenVpnService;
+import de.blinkt.openvpn.core.OpenVPNService.LocalBinder;
+import de.blinkt.openvpn.core.OpenVPNService;
 import de.blinkt.openvpn.core.ProfileManager;
 import de.blinkt.openvpn.core.VpnStatus.ConnectionStatus;
 import java.io.IOException;
@@ -73,7 +73,7 @@ import se.leap.bitmaskclient.R;
  * Internet Proxy connection.  Connections are started, stopped, and queried through
  * this IntentService.
  * Contains logic for parsing eip-service.json from the provider, configuring and selecting
- * gateways, and controlling {@link de.blinkt.openvpn.core.OpenVpnService} connections.
+ * gateways, and controlling {@link de.blinkt.openvpn.core.OpenVPNService} connections.
  * 
  * @author Sean Leonard <meanderingcode@aetherislands.net>
  * @author Parménides GV <parmegv@sdf.org>
@@ -105,7 +105,6 @@ public final class EIP extends IntentService {
     
 	private static Context context;
 	private static ResultReceiver mReceiver;
-	private static OpenVpnService mVpnService;
 	private static boolean mBound = false;
 	// Used to store actions to "resume" onServiceConnection
 	private static String mPending = null;
@@ -467,7 +466,6 @@ public final class EIP extends IntentService {
 				cp.parseConfig(new StringReader(certSecretFromSharedPreferences()));
 				cp.parseConfig(new StringReader("remote-cert-tls server"));
 				cp.parseConfig(new StringReader("persist-tun"));
-				Log.d(TAG, "persist-tun");
 				VpnProfile vp = cp.convertProfile();
 				//vp.mAuthenticationType=VpnProfile.TYPE_STATICKEYS;
 				mVpnProfile = vp;
diff --git a/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java
index c8a28c0a..18ee0262 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java
@@ -251,7 +251,7 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe
     }
 
     private boolean isDisconnectedLevel(final ConnectionStatus level) {
-	return level == ConnectionStatus.LEVEL_NONETWORK || level == ConnectionStatus.LEVEL_NOTCONNECTED || level == ConnectionStatus.LEVEL_AUTH_FAILED;
+	return level == ConnectionStatus.LEVEL_NOTCONNECTED || level == ConnectionStatus.LEVEL_AUTH_FAILED;
     }
 
     private void setConnectedUI() {