summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2017-07-31 22:06:33 +0200
committerArne Schwabe <arne@rfc2549.org>2017-07-31 22:06:33 +0200
commitec8652603db30c88c95c478b1d1092f57ea4331b (patch)
tree1a03cdbe05c7243dd11d06d3a12489c4dd719110 /main
parent84ec02a142c090cb2a18f74e0a9bbaacab37d7ee (diff)
Silently ignore parsing error if DNS server looks like IPv6 (and hope that Samsung only screwed up IPv4)
Diffstat (limited to 'main')
-rw-r--r--main/build.gradle6
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java4
2 files changed, 6 insertions, 4 deletions
diff --git a/main/build.gradle b/main/build.gradle
index 551fda43..afe19468 100644
--- a/main/build.gradle
+++ b/main/build.gradle
@@ -19,9 +19,9 @@ repositories {
}
dependencies {
- compile 'com.android.support:support-annotations:25.4.0'
- compile 'com.android.support:cardview-v7:25.4.0'
- compile 'com.android.support:recyclerview-v7:25.4.0'
+ compile 'com.android.support:support-annotations:26.0.0'
+ compile 'com.android.support:cardview-v7:26.0.0'
+ compile 'com.android.support:recyclerview-v7:26.0.0'
// compile 'ch.acra:acra:4.5.0'
compile 'com.github.PhilJay:MPAndroidChart:v3.0.2'
diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
index a4551bf9..a4b7b480 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
@@ -764,7 +764,9 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
positiveIPv4Routes.add(dnsServer);
}
} catch (Exception e) {
- VpnStatus.logError("Error parsing DNS Server IP: " + mDnslist.get(0));
+ // If it looks like IPv6 ignore error
+ if (!mDnslist.get(0).contains(":"))
+ VpnStatus.logError("Error parsing DNS Server IP: " + mDnslist.get(0));
}
}