From 1787d6dcbb0cc54e78043e6093ac45b09f0986a7 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sun, 13 May 2012 02:03:20 +0200
Subject: Version 0.5.3 Fix a few new bugs before pushing to the market :)

---
 res/layout/faq.xml                         | 8 ++++++++
 res/values-de/strings.xml                  | 2 +-
 res/values/strings.xml                     | 4 +++-
 src/de/blinkt/openvpn/ConfigConverter.java | 2 --
 src/de/blinkt/openvpn/ConfigParser.java    | 3 ++-
 src/de/blinkt/openvpn/FileSelect.java      | 5 +++--
 src/de/blinkt/openvpn/VpnProfile.java      | 5 ++++-
 7 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/res/layout/faq.xml b/res/layout/faq.xml
index a05cc6df..88dcc7c6 100644
--- a/res/layout/faq.xml
+++ b/res/layout/faq.xml
@@ -16,6 +16,14 @@
             style="@style/faqitem"
             android:text="@string/faq_tap_mode" />
 
+        <TextView
+            style="@style/faqhead"
+            android:text="@string/faq_security_title" />
+
+        <TextView
+            style="@style/faqitem"
+            android:text="@string/faq_security" />
+
         <TextView
             style="@style/faqhead"
             android:text="@string/faq_shortcut" />
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4215b60b..83907380 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -18,7 +18,7 @@
     <string name="file_name">Dateiname:</string>
     <string name="cancel">Abbrechen</string>
     <string name="create">Speichern</string>
-    <string name="no_data">Kein Daten</string>
+    <string name="no_data">Keine Daten</string>
     <string name="err">Fehler</string>
     <string name="usercert">Clientzertifikat</string>
     <string name="useLZO">LZO Komprimierung</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e2121d4b..41f229de 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -210,5 +210,7 @@
     <string name="nobind_summary">Do not bind to local address and port</string>
     <string name="no_bind">No local binding</string>
     <string name="import_experimental">Please not that the config importer is an experimental feature.</string>
-    <string name="import_configuration_file">Import configuration file</string>  
+    <string name="import_configuration_file">Import configuration file</string>
+    <string name="faq_security_title">Security considerations</string>
+    <string name="faq_security">"As openvpn is security sensitive a few notes about security are sensible. All data on the sdcard is inherently unsecure. Every app can read it (for example this program requires no special sd card rights). The data of this application can only be read by the application itself. By using the import option for cacert/cert/key in the file dialog the data is stored in the vpn profile. The vpn profiles are only accessable by this application. (Do not forget to delte the copies on the sdcard afterwards). Even though accessible only by this application the data is stil unecrypted. By rooting the telephone or other exploits it may be possible to retrieve the data. Saved passwords are stored in plain text as well. For pkcs12 files it is highly recommended that you import them into the android keystore."</string>  
 </resources>
diff --git a/src/de/blinkt/openvpn/ConfigConverter.java b/src/de/blinkt/openvpn/ConfigConverter.java
index 686a4e42..50d08b73 100644
--- a/src/de/blinkt/openvpn/ConfigConverter.java
+++ b/src/de/blinkt/openvpn/ConfigConverter.java
@@ -15,7 +15,6 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.ArrayAdapter;
-import android.widget.Toast;
 import de.blinkt.openvpn.ConfigParser.ConfigParseError;
 
 public class ConfigConverter extends ListActivity {
@@ -29,7 +28,6 @@ public class ConfigConverter extends ListActivity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		Toast.makeText(this, "Got called!", Toast.LENGTH_LONG).show();
 	}
 
 
diff --git a/src/de/blinkt/openvpn/ConfigParser.java b/src/de/blinkt/openvpn/ConfigParser.java
index a64fb403..1b37c0a8 100644
--- a/src/de/blinkt/openvpn/ConfigParser.java
+++ b/src/de/blinkt/openvpn/ConfigParser.java
@@ -219,7 +219,8 @@ public class ConfigParser {
 			"route-gateway",
 			"topology",
 			"persist-tun",
-			"route-metric"
+			"route-metric",
+			"suppress-timestamps"
 			
 	};
 	
diff --git a/src/de/blinkt/openvpn/FileSelect.java b/src/de/blinkt/openvpn/FileSelect.java
index cc8f55f4..62cd9883 100644
--- a/src/de/blinkt/openvpn/FileSelect.java
+++ b/src/de/blinkt/openvpn/FileSelect.java
@@ -53,7 +53,6 @@ public class FileSelect extends Activity {
 		inlineFileTab = bar.newTab().setText(R.string.inline_file_tab); 
 
 		mFSFragment = new FileSelectionFragment();
-		mFSFragment.setNoInLine();
 		fileExplorerTab.setTabListener(new MyTabsListener<FileSelectionFragment>(this, mFSFragment));
 		bar.addTab(fileExplorerTab);
 		
@@ -61,7 +60,9 @@ public class FileSelect extends Activity {
 			mInlineFragment = new InlineFileTab();
 			inlineFileTab.setTabListener(new MyTabsListener<InlineFileTab>(this, mInlineFragment));
 			bar.addTab(inlineFileTab);
-			}
+		} else {
+			mFSFragment.setNoInLine();
+		}
 
 		
 	}
diff --git a/src/de/blinkt/openvpn/VpnProfile.java b/src/de/blinkt/openvpn/VpnProfile.java
index aed9ca03..b5e421fb 100644
--- a/src/de/blinkt/openvpn/VpnProfile.java
+++ b/src/de/blinkt/openvpn/VpnProfile.java
@@ -148,7 +148,10 @@ public class VpnProfile implements  Serializable{
 		cfg+="tmp-dir ";
 		cfg+=cacheDir.getAbsolutePath();
 		cfg+="\n\n";
-		
+
+		cfg+="# Log window is better readable this way\n";
+		cfg+="suppress-timestamps\n";
+
 		
 
 		boolean useTLSClient = (mAuthenticationType != TYPE_STATICKEYS);
-- 
cgit v1.2.3