summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-05-08 16:34:47 +0200
committerArne Schwabe <arne@rfc2549.org>2012-05-08 16:34:47 +0200
commitb187f57a026110ef0b0f1d6b6414c868922cab46 (patch)
treee717cc737e5c892790752cfa6c7dc96b761db60a
parent271a9073948f1a47786ae40f5af6e58e7992a767 (diff)
Add FAQ Dialog, will be filled with more Items later
-rw-r--r--README.txt2
-rw-r--r--res/layout/faq.xml36
-rw-r--r--res/values/strings.xml8
-rw-r--r--res/values/styles.xml15
-rw-r--r--res/xml/main_headers.xml6
-rw-r--r--src/de/blinkt/openvpn/AboutPreference.java14
-rw-r--r--todo.txt14
7 files changed, 78 insertions, 17 deletions
diff --git a/README.txt b/README.txt
index 8be3c682..62c0caac 100644
--- a/README.txt
+++ b/README.txt
@@ -3,4 +3,4 @@ This is my first Android project, so some things my be done in a completely stup
I am for example not really sure if it was a good idea to use the Preferences Framework for the preferences.
-See also the file todo.txt for idea/not yet implemented features \ No newline at end of file
+See also the file todo.txt for ideas/not yet implemented features. \ No newline at end of file
diff --git a/res/layout/faq.xml b/res/layout/faq.xml
new file mode 100644
index 00000000..195acad8
--- /dev/null
+++ b/res/layout/faq.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical" >
+
+ <TextView
+ style="@style/faqhead"
+ android:text="@string/tap_mode" />
+
+ <TextView
+ style="@style/faqitem"
+ android:text="@string/faq_tap_mode" />
+
+ <TextView
+ style="@style/faqhead"
+ android:text="@string/tap_mode" />
+
+ <TextView
+ style="@style/faqitem"
+ android:text="@string/tap_faq2" />
+
+ <TextView
+ style="@style/faqhead"
+ android:text="@string/tap_mode" />
+
+ <TextView
+ style="@style/faqitem"
+ android:text="@string/tap_faq3" />
+ </LinearLayout>
+
+</ScrollView> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1ed40d9e..452de786 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -172,5 +172,11 @@
<string name="send_logfile">Send Logfile</string>
<string name="send">Send</string>
<string name="ics_openvpn_log_file">ICS Openvpn log file</string>
- <string name="copied_entry">Copied log entry to clip board</string>
+ <string name="copied_entry">Copied log entry to clip board</string>
+ <string name="tap_mode">Tap Mode</string>
+ <string name="faq_tap_mode">Tap Mode is not possible with the non root VPN api. Therefore this application cannot provide tap support</string>
+ <string name="tap_faq2">Again? Are you kidding? No tap mode is really not supported and sending more mail aksing if it will be supported will not help.</string>
+ <string name="tap_faq3">A third time? Actually one could write a a tap emulator based on tun that would add layer2 information on send and strip layer2 information on receive. But this tap emulator would have to implement also ARP and possible a DHCP client. I am not aware of anybody doing any work in this direction. Contact me if you want to start coding on this.</string>
+ <string name="faq">FAQ</string>
+ <string name="faq_summary">frequently asked questions and some adivce</string>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 7ae97cd1..2c627bff 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -24,6 +24,21 @@
<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
<item name="android:singleLine">true</item>
</style>
+
+ <style name="faqitem">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
+ </style>
+
+
+ <style name="faqhead">
+ <item name="android:paddingTop">10sp</item>
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:textAppearance">?android:attr/textAppearanceLarge</item>
+ <item name="android:singleLine">true</item>
+ </style>
<style name="accountSetupButton">
<item name="android:layout_width">160sp</item>
diff --git a/res/xml/main_headers.xml b/res/xml/main_headers.xml
index 0270f9bf..71913f49 100644
--- a/res/xml/main_headers.xml
+++ b/res/xml/main_headers.xml
@@ -5,6 +5,12 @@
android:fragment="de.blinkt.openvpn.VPNProfileList"
android:summary="@string/vpn_list_summary"
android:title="@string/vpn_list_title" />
+
+ <header
+ android:fragment="de.blinkt.openvpn.FaqFragment"
+ android:summary="@string/faq_summary"
+ android:title="@string/faq" />
+
<header
android:fragment="de.blinkt.openvpn.AboutFragment"
android:summary="@string/about_summary"
diff --git a/src/de/blinkt/openvpn/AboutPreference.java b/src/de/blinkt/openvpn/AboutPreference.java
deleted file mode 100644
index ff6c611d..00000000
--- a/src/de/blinkt/openvpn/AboutPreference.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package de.blinkt.openvpn;
-
-import android.content.Context;
-import android.preference.Preference;
-import android.util.AttributeSet;
-
-public class AboutPreference extends Preference {
-
- public AboutPreference(Context context, AttributeSet attrs) {
- super(context, attrs);
- setWidgetLayoutResource(R.layout.about);
- }
-
-}
diff --git a/todo.txt b/todo.txt
index 0b58dc57..69338c5f 100644
--- a/todo.txt
+++ b/todo.txt
@@ -20,9 +20,21 @@ IPv6 support:
- Implementing/testing IPv6 route/ifconfig/DNS Server
+Tap support:
+- People still ask how to do tap support. :(
+- Put statements that tap is not supported everywhere.
+- Actually it is possible to emulate tap with tun device, a minimal implementation would have to do:
+ - generate random mac
+ - strip macs header on receive
+ - append mac header on send
+ - implement arp, possible the most difficult task ...
+ - need to chose right mac of receiver
+
+
+
Requested by users:
cipher
-mtu-link
auth
+mtu-link