diff options
| author | cyBerta <richy@cyborgsociety.org> | 2013-11-26 13:45:01 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2013-12-04 16:00:48 +0100 |
| commit | e26be4756596acf5be292955079ae33f228408d8 (patch) | |
| tree | 89312c6990a658e5ac4e705c2411bf5e68c1be3e /src/se/leap/openvpn | |
| parent | 371a37fb024d3bf0609efbdb877d69b36a844f10 (diff) | |
bugfixes for switch toggle behavior
Diffstat (limited to 'src/se/leap/openvpn')
| -rw-r--r-- | src/se/leap/openvpn/OpenVPNThread.java | 2 | ||||
| -rw-r--r-- | src/se/leap/openvpn/OpenVpnManagementThread.java | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/se/leap/openvpn/OpenVPNThread.java b/src/se/leap/openvpn/OpenVPNThread.java index 0c383ab0..ffd21732 100644 --- a/src/se/leap/openvpn/OpenVPNThread.java +++ b/src/se/leap/openvpn/OpenVPNThread.java @@ -56,7 +56,7 @@ public class OpenVPNThread implements Runnable { if( exitvalue != 0)
OpenVPN.logError("Process exited with exit value " + exitvalue);
- OpenVPN.updateStateString("NOPROCESS","No process running.", R.string.state_noprocess);
+// OpenVPN.updateStateString("NOPROCESS","No process running.", R.string.state_noprocess); fixes bug #4565
if(mDumpPath!=null) {
try {
BufferedWriter logout = new BufferedWriter(new FileWriter(mDumpPath + ".log"));
diff --git a/src/se/leap/openvpn/OpenVpnManagementThread.java b/src/se/leap/openvpn/OpenVpnManagementThread.java index b4da1e30..287de58e 100644 --- a/src/se/leap/openvpn/OpenVpnManagementThread.java +++ b/src/se/leap/openvpn/OpenVpnManagementThread.java @@ -211,8 +211,11 @@ public class OpenVpnManagementThread implements Runnable { OpenVPN.logMessage(0, "MGMT:", "Got unrecognized command" + command);
Log.i(TAG, "Got unrecognized command" + command);
}
- } else if (command.startsWith("SUCCESS:")) {
- // ignore
+ } else if (command.startsWith("SUCCESS:")) { //Fixes bug LEAP #4565
+ if (command.equals("SUCCESS: signal SIGINT thrown")){
+ Log.d(TAG, "SUCCESS: signal SIGINT thrown");
+ processState(",EXITING,SIGINT,,");
+ }
} else {
Log.i(TAG, "Got unrecognized line from managment" + command);
OpenVPN.logMessage(0, "MGMT:", "Got unrecognized line from management:" + command);
|