mirror/openvpn-android
0
0
Fork 0
mirror of https://github.com/schwabe/ics-openvpn.git synced 2024-09-19 11:32:27 +02:00
Code

Silently ignore parsing error if DNS server looks like IPv6 (and hope that Samsung only screwed up IPv4)

Browse Source
This commit is contained in:
Arne Schwabe 2017-07-31 22:06:33 +02:00
parent 84ec02a142
commit ec8652603d
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/copyright/ics_openvpn_gpl.xml
View File

@ -1,6 +1,5 @@
<component name="CopyrightManager">
<copyright>
<option name="allowReplaceRegexp" value="Copyright \(c\) 2012\-2016Arne Schwabe" />
<option name="myName" value="ics-openvpn-gpl" />
<option name="notice" value="Copyright (c) 2012-&amp;#36;{today.year} Arne Schwabe&#10;Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt" />
</copyright>

6
main/build.gradle
View File

@ -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'

4
main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
View File

@ -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));
}
}