summaryrefslogtreecommitdiff
path: root/app/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2018-02-06 15:05:02 +0100
committercyBerta <cyberta@riseup.net>2018-02-06 15:05:02 +0100
commit1a37ac3f86e0bd44842a0fcd86de7c160acfbb04 (patch)
treebc32fb50b59c415097804fd7bbdb296641310cde /app/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
parenta1ac4910f062ca8aca06e0468fffef751d3bb714 (diff)
parentedd34192484f4eb618fdcc2a68b18168c155d63c (diff)
Merge branch 'origin_0.9.8' into fupduck_8826_custom_provider
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);