Merge branch 'develop'

1 files changed, 10 insertions, 6 deletions

diff --git a/app/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java b/app/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java
index 010cc4f0..b5bba5d4 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java
@@ -79,7 +79,6 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
 	else
 	    return false;
     }
-    
     // From: http://stackoverflow.com/questions/3758606/how-to-convert-byte-size-into-human-readable-format-in-java
     public static String humanReadableByteCount(long bytes, boolean mbit) {
         if (mbit)
@@ -748,12 +747,17 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
 
     public String getTunReopenStatus() {
         String currentConfiguration = getTunConfigString();
-        if (currentConfiguration.equals(mLastTunCfg))
+        if (currentConfiguration.equals(mLastTunCfg)) {
             return "NOACTION";
-        else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
-            return "OPEN_AFTER_CLOSE";
-        else
-            return "OPEN_BEFORE_CLOSE";
+        } else {
+            String release = Build.VERSION.RELEASE;
+            if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT && !release.startsWith("4.4.3")
+                    &&  !release.startsWith("4.4.4") &&  !release.startsWith("4.4.5"))
+                // There will be probably no 4.4.4 or 4.4.5 version, so don't waste effort to do parsing here
+                return "OPEN_AFTER_CLOSE";
+            else
+                return "OPEN_BEFORE_CLOSE";
+        }
     }
 
     public class LocalBinder extends Binder {