summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-06-01 11:15:00 +0200
committerArne Schwabe <arne@rfc2549.org>2012-06-01 11:15:00 +0200
commit23c305fb6b9d4b0fdfd453c42726c72c523d60cb (patch)
tree30350bb7d8048f9b3ef601dc8ade13eed36d8527
parent5c59be6d8622cb800d9e22b51b50bb59db7517e4 (diff)
- Fix custom search domain ignored (closes issue #36)
-rw-r--r--res/values-de/strings.xml5
-rw-r--r--res/values/strings.xml1
-rw-r--r--src/de/blinkt/openvpn/VpnProfile.java6
3 files changed, 8 insertions, 4 deletions
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 61d6e639..97adb922 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -167,6 +167,7 @@
<string name="owner_fix_summary">Versuch den Eigentümer von /dev/tun auf system zu ändern. Einige Cyanogenmod 9 ROM Versionen benötigen diese Option, damit die VPN API funktioniert. Benötigt root.</string>
<string name="owner_fix">/dev/tun Eigentümer setzen.</string>
<string name="generated_config_summary">Zeigt die generierte Konfigurationsdatei</string>
- <string name="edit_profile_title">Editiere \"%s\"</string>
-
+ <string name="edit_profile_title">Editiere \"%s\"</string>
+ <string name="building_configration">Generiere OpenVPN Konfigration…</string>
+
</resources> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 93283479..42749081 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -206,4 +206,5 @@
<string name="owner_fix">Fix ownership of /dev/tun</string>
<string name="generated_config_summary">Shows the generated openvpn Configuration File</string>
<string name="edit_profile_title">Editing \"%s\"</string>
+ <string name="building_configration">Building configration…</string>
</resources>
diff --git a/src/de/blinkt/openvpn/VpnProfile.java b/src/de/blinkt/openvpn/VpnProfile.java
index d9c39cab..936a88c6 100644
--- a/src/de/blinkt/openvpn/VpnProfile.java
+++ b/src/de/blinkt/openvpn/VpnProfile.java
@@ -271,10 +271,12 @@ public class VpnProfile implements Serializable{
}
if(mOverrideDNS || !mUsePull) {
- if(!mDNS1.equals("") && mDNS1!=null)
+ if(nonNull(mDNS1))
cfg+="dhcp-option DNS " + mDNS1 + "\n";
- if(!mDNS2.equals("") && mDNS2!=null)
+ if(nonNull(mDNS2))
cfg+="dhcp-option DNS " + mDNS2 + "\n";
+ if(nonNull(mSearchDomain))
+ cfg+="dhcp-option DOMAIN " + mSearchDomain + "\n";
}