summaryrefslogtreecommitdiff
path: root/src/de
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-11-20 22:18:08 +0100
committerArne Schwabe <arne@rfc2549.org>2012-11-20 22:18:08 +0100
commit5185087bfc481f45e4dda8a0f23e701bb1e9add7 (patch)
treeac8da329a247a0c6f887daa943df45900b6f6b46 /src/de
parent25e680bf2d4391709cd45bc0b55f3a220885357f (diff)
Add script to generate FAQ in the google CODE project.
Diffstat (limited to 'src/de')
-rw-r--r--src/de/blinkt/openvpn/ConfigParser.java2
-rw-r--r--src/de/blinkt/openvpn/FaqFragment.java6
-rw-r--r--src/de/blinkt/openvpn/VpnProfile.java1
3 files changed, 6 insertions, 3 deletions
diff --git a/src/de/blinkt/openvpn/ConfigParser.java b/src/de/blinkt/openvpn/ConfigParser.java
index 3d20bc31..1098058f 100644
--- a/src/de/blinkt/openvpn/ConfigParser.java
+++ b/src/de/blinkt/openvpn/ConfigParser.java
@@ -229,10 +229,12 @@ public class ConfigParser {
"route-gateway",
"route-metric",
"route-method",
+ "script-security",
"show-net-up",
"suppress-timestamps",
"tmp-dir",
"topology",
+ "win-sys"
};
diff --git a/src/de/blinkt/openvpn/FaqFragment.java b/src/de/blinkt/openvpn/FaqFragment.java
index 1b262c7f..a358dc9a 100644
--- a/src/de/blinkt/openvpn/FaqFragment.java
+++ b/src/de/blinkt/openvpn/FaqFragment.java
@@ -22,10 +22,10 @@ public class FaqFragment extends Fragment {
Bundle savedInstanceState) {
View v= inflater.inflate(R.layout.faq, container, false);
- insertHtmlEntry(v,R.id.brokenimages,R.string.broken_images_faq);
+ insertHtmlEntry(v,R.id.broken_images_faq,R.string.broken_images_faq);
insertHtmlEntry(v,R.id.faq_howto,R.string.faq_howto);
- insertHtmlEntry(v, R.id.faq_battery, R.string.baterry_consumption);
- insertHtmlEntry(v, R.id.vpn_tethering, R.string.faq_tethering);
+ insertHtmlEntry(v, R.id.baterry_consumption, R.string.baterry_consumption);
+ insertHtmlEntry(v, R.id.faq_tethering, R.string.faq_tethering);
return v;
diff --git a/src/de/blinkt/openvpn/VpnProfile.java b/src/de/blinkt/openvpn/VpnProfile.java
index bdfdd70a..a71758d1 100644
--- a/src/de/blinkt/openvpn/VpnProfile.java
+++ b/src/de/blinkt/openvpn/VpnProfile.java
@@ -101,6 +101,7 @@ public class VpnProfile implements Serializable{
public boolean mUseDefaultRoutev6=true;
public String mCustomRoutesv6="";
public String mKeyPassword="";
+
static final String MINIVPN = "miniopenvpn";
public boolean mPersistTun = false;