From 5fed3f98fdd55ee26df2f5961796bca7368b25a2 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Wed, 17 Jan 2018 20:23:21 +0100 Subject: Simplify DNS/DNS6 handling --- main/src/main/java/de/blinkt/openvpn/VpnProfile.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/main/src/main/java/de/blinkt/openvpn/VpnProfile.java b/main/src/main/java/de/blinkt/openvpn/VpnProfile.java index ca6d4c5f..7a77dd0c 100644 --- a/main/src/main/java/de/blinkt/openvpn/VpnProfile.java +++ b/main/src/main/java/de/blinkt/openvpn/VpnProfile.java @@ -489,16 +489,10 @@ public class VpnProfile implements Serializable, Cloneable { if (mOverrideDNS || !mUsePull) { if (!TextUtils.isEmpty(mDNS1)) { - if (mDNS1.contains(":")) - cfg += "dhcp-option DNS6 " + mDNS1 + "\n"; - else - cfg += "dhcp-option DNS " + mDNS1 + "\n"; + cfg += "dhcp-option DNS " + mDNS1 + "\n"; } if (!TextUtils.isEmpty(mDNS2)) { - if (mDNS2.contains(":")) - cfg += "dhcp-option DNS6 " + mDNS2 + "\n"; - else - cfg += "dhcp-option DNS " + mDNS2 + "\n"; + cfg += "dhcp-option DNS " + mDNS2 + "\n"; } if (!TextUtils.isEmpty(mSearchDomain)) cfg += "dhcp-option DOMAIN " + mSearchDomain + "\n"; -- cgit v1.2.3