From 1c6052df6172f8f4e025fa0934abe58aab640430 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sat, 5 May 2012 02:52:57 +0200
Subject: 0.4.8b - the my phone has a /tmp but most ics do not

---
 AndroidManifest.xml                         |  4 ++--
 openvpn/src/openvpn/options.c               | 10 +++++-----
 src/de/blinkt/openvpn/Settings_Obscure.java |  2 +-
 src/de/blinkt/openvpn/VpnProfile.java       |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 75fe58dd..49778363 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,8 +17,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.blinkt.openvpn"
-    android:versionCode="16"
-    android:versionName="0.4.8" >
+    android:versionCode="18"
+    android:versionName="0.4.8b" >
 
     <uses-permission android:name="android.permission.INTERNET" />
 
diff --git a/openvpn/src/openvpn/options.c b/openvpn/src/openvpn/options.c
index c48d7be9..525c00cd 100644
--- a/openvpn/src/openvpn/options.c
+++ b/openvpn/src/openvpn/options.c
@@ -5420,6 +5420,11 @@ add_option (struct options *options,
       options->occ = false;
     }
 #endif
+  else if (streq (p[0], "tmp-dir") && p[1])
+  {
+      VERIFY_PERMISSION (OPT_P_GENERAL);
+      options->tmp_dir = p[1];
+  }
 #if P2MP
 #if P2MP_SERVER
   else if (streq (p[0], "server") && p[1] && p[2])
@@ -5701,11 +5706,6 @@ add_option (struct options *options,
       warn_multiple_script (options->learn_address_script, "learn-address");
       options->learn_address_script = p[1];
     }
-  else if (streq (p[0], "tmp-dir") && p[1])
-    {
-      VERIFY_PERMISSION (OPT_P_GENERAL);
-      options->tmp_dir = p[1];
-    }
   else if (streq (p[0], "client-config-dir") && p[1])
     {
       VERIFY_PERMISSION (OPT_P_GENERAL);
diff --git a/src/de/blinkt/openvpn/Settings_Obscure.java b/src/de/blinkt/openvpn/Settings_Obscure.java
index 91c6170b..fd3b540d 100644
--- a/src/de/blinkt/openvpn/Settings_Obscure.java
+++ b/src/de/blinkt/openvpn/Settings_Obscure.java
@@ -69,7 +69,7 @@ public class Settings_Obscure extends PreferenceFragment implements OnPreference
 		if(preference==mLogverbosity) {
 			// Catch old version problem
 			if(newValue==null){
-				newValue=1;
+				newValue="1";
 			}
 			mLogverbosity.setDefaultValue(newValue);
 			//This is idiotic. 
diff --git a/src/de/blinkt/openvpn/VpnProfile.java b/src/de/blinkt/openvpn/VpnProfile.java
index 31f32f85..f6ece687 100644
--- a/src/de/blinkt/openvpn/VpnProfile.java
+++ b/src/de/blinkt/openvpn/VpnProfile.java
@@ -181,12 +181,12 @@ public class VpnProfile implements  Serializable{
 		cfg += "management-hold\n\n";
 
 		/* only needed if client is compiled with P2MP Server support as early version 
-		 * accidently were
+		 * accidently were */
 		cfg+="# /tmp does not exist on Android\n";
 		cfg+="tmp-dir ";
 		cfg+=cacheDir.getAbsolutePath();
 		cfg+="\n\n";
-		 */
+		
 		boolean useTLSClient = (mAuthenticationType != TYPE_STATICKEYS);
 
 		if(useTLSClient && mUsePull)
-- 
cgit v1.2.3