summaryrefslogtreecommitdiff
path: root/app/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
diff options
context:
space:
mode:
authorfupduck <fupduck@riseup.net>2018-02-06 05:53:09 -0800
committerfupduck <fupduck@riseup.net>2018-02-06 05:53:09 -0800
commitedd34192484f4eb618fdcc2a68b18168c155d63c (patch)
treed884f63e74911d2ea2cf7bc864414a623e15a2b3 /app/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
parentc0848bac7ac44f4b09f9e5d66ab71f079cb0f514 (diff)
parentd2d61a16fd2a3ea0fd42073de98d1311b184444d (diff)
Merge branch '#8832_update_ics-openvpn' into '0.9.8'
#8832 update ics openvpn See merge request leap/bitmask_android!33
Diffstat (limited to 'app/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java')
-rw-r--r--app/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java5
1 files changed, 3 insertions, 2 deletions
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 c96f88c4..b902f5d7 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
@@ -111,7 +111,8 @@ public class OpenVPNThread implements Runnable {
}
}
- mService.processDied();
+ if (!mNoProcessExitStatus)
+ mService.openvpnStopped();
Log.i(TAG, "Exiting");
}
}
@@ -177,7 +178,7 @@ public class OpenVPNThread implements Runnable {
VpnStatus.logMessageOpenVPN(logStatus, logLevel, msg);
if (logerror==1)
- VpnStatus.logError("OpenSSL reproted a certificate with a weak hash, please the in app FAQ about weak hashes");
+ VpnStatus.logError("OpenSSL reported a certificate with a weak hash, please the in app FAQ about weak hashes");
} else {
VpnStatus.logInfo("P:" + logline);