summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2018-01-17 20:23:21 +0100
committerArne Schwabe <arne@rfc2549.org>2018-01-17 20:23:21 +0100
commit5fed3f98fdd55ee26df2f5961796bca7368b25a2 (patch)
tree0296b54bc0fa4707dd3daebe4c6e3002d2b116ed
parent5ad6023ba1e3ef2cedc5e803487a2dd5b4a1afc3 (diff)
Simplify DNS/DNS6 handling
-rw-r--r--main/src/main/java/de/blinkt/openvpn/VpnProfile.java10
1 files 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";