From af87e5e9626236c1ea3cda594ebf0a63bfc3d5b5 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Wed, 28 Sep 2016 12:43:48 +0200
Subject: Ignore errors when the management connection is closed (i.e. OpenVPN
 process exited), closes #553

---
 build.gradle                                                        | 2 +-
 main/build.gradle                                                   | 6 +++---
 .../main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java   | 3 +--
 main/src/main/res/values/strings.xml                                | 1 +
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index a7407184..1464dd50 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0-rc1'
+        classpath 'com.android.tools.build:gradle:2.2.0'
     }
 }
 
diff --git a/main/build.gradle b/main/build.gradle
index 4a0783cb..f031162b 100644
--- a/main/build.gradle
+++ b/main/build.gradle
@@ -12,9 +12,9 @@ repositories {
 }
 
 dependencies {
-    compile 'com.android.support:support-annotations:24.2.0'
-    compile 'com.android.support:cardview-v7:24.2.0'
-    compile 'com.android.support:recyclerview-v7:24.2.0'
+    compile 'com.android.support:support-annotations:24.2.1'
+    compile 'com.android.support:cardview-v7:24.2.1'
+    compile 'com.android.support:recyclerview-v7:24.2.1'
     //    compile 'ch.acra:acra:4.5.0'
 
     testCompile 'junit:junit:4.12'
diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
index 90533972..16a03394 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
@@ -164,8 +164,7 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
 
             }
         } catch (IOException e) {
-            if (!e.getMessage().equals("socket closed") && !e.getMessage().equals("Connection reset by peer"))
-                VpnStatus.logException(e);
+            VpnStatus.logDebug(R.string.management_socket_closed, e.getLocalizedMessage());
         }
         synchronized (active) {
             active.remove(this);
diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml
index d9c11a8b..62b4eb38 100755
--- a/main/src/main/res/values/strings.xml
+++ b/main/src/main/res/values/strings.xml
@@ -416,4 +416,5 @@
     <string name="connectretrymaxtitle">Maximum time between connection attempts</string>
     <string name="state_waitconnectretry">Waiting %ss seconds between connection attempt</string>
     <string name="nought_alwayson_warning"><![CDATA[If you did not get a VPN confirmation dialog, you have \"Always on VPN\" enabled for another app. In that case only that app is allowed to connect to a VPN. Check under Settings-> Networks more .. -> VPNS]]></string>
+    <string name="management_socket_closed">Connection to OpenVPN closed (%s)</string>
 </resources>
-- 
cgit v1.2.3