diff options
author | Parménides GV <parmegv@sdf.org> | 2016-04-02 15:30:51 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2016-04-02 15:30:51 +0200 |
commit | c260dff02dcc773320fbdc4e3f89131ec7a1b3fc (patch) | |
tree | db7ddf01d4999a23d6f228ddf40190a6631a96b2 /app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java | |
parent | 93aca53eae03b4b31877e97991d61bdc11a2db44 (diff) | |
parent | 574960d09f5cf054001f8f6e9eb54f80312b60db (diff) |
Merge branch 'update-ics-openvpn' into develop
Diffstat (limited to 'app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java')
-rw-r--r-- | app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java | 10 |
1 files changed, 7 insertions, 3 deletions
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 4c550f47..569a3846 100644 --- a/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java +++ b/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java @@ -49,6 +49,7 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement { private pauseReason lastPauseReason = pauseReason.noNetwork; private PausedStateCallback mPauseCallback; + private boolean mShuttingDown; public OpenVpnManagementThread(VpnProfile profile, OpenVPNService openVpnService) { mProfile = profile; @@ -223,7 +224,8 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement { processByteCount(argument); break; case "STATE": - processState(argument); + if (!mShuttingDown) + processState(argument); break; case "PROXY": processProxyCMD(argument); @@ -452,7 +454,7 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement { break; default: - Log.e(TAG, "Unkown needok command " + argument); + Log.e(TAG, "Unknown needok command " + argument); return; } @@ -621,7 +623,9 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement { } @Override - public boolean stopVPN() { + public boolean stopVPN(boolean replaceConnection) { + mShuttingDown = true; return stopOpenVPN(); } + } |