Vpn stop management issues (#572)

* Fixed error, when stopVPN method in ManagementThread returned true regardless of actual stop signal have been sent.

As result - management stopped to send any state updates to listeners because of mShuttingDown flag.

* Fixed error, when endVpnService method didn't actually stop vpn thread because of missing thread interruption handling.

1 files changed, 5 insertions, 3 deletions

diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
index 59bcca37..b2774861 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
@@ -180,10 +180,12 @@ public class OpenVPNThread implements Runnable {
                 } else {

                     VpnStatus.logInfo("P:" + logline);

                 }

-            }

-

 

-        } catch (IOException e) {

+                if (Thread.interrupted()) {

+                    throw new InterruptedException("OpenVpn process was killed form java code");

+                }

+            }

+        } catch (InterruptedException | IOException e) {

             VpnStatus.logException("Error reading from output of OpenVPN process", e);

             stopProcess();

         }