From 951bc8dd9532a772db610aff59af2d96a6ab05db Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 10 Jul 2012 23:00:52 +0200
Subject: Fine tune config convert messages Import tls-auth [inline] dir
 correctly (closes issue #55)

---
 src/de/blinkt/openvpn/ConfigConverter.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/de/blinkt/openvpn/ConfigConverter.java')

diff --git a/src/de/blinkt/openvpn/ConfigConverter.java b/src/de/blinkt/openvpn/ConfigConverter.java
index 101c90b0..ed252f7d 100644
--- a/src/de/blinkt/openvpn/ConfigConverter.java
+++ b/src/de/blinkt/openvpn/ConfigConverter.java
@@ -1,3 +1,4 @@
+
 package de.blinkt.openvpn;
 
 import java.io.File;
@@ -187,7 +188,7 @@ public class ConfigConverter extends ListActivity {
 			final android.net.Uri data = intent.getData ();
 			if (data != null)
 			{
-				log(R.string.import_experimental);
+				//log(R.string.import_experimental);
 				log(R.string.importing_config,data.toString());
 				try {
 					InputStream is = getContentResolver().openInputStream(data);
@@ -232,7 +233,13 @@ public class ConfigConverter extends ListActivity {
 	private void displayWarnings() {
 		if(mResult.mUseCustomConfig) {
 			log(R.string.import_warning_custom_options);
-			log(mResult.mCustomConfigOptions);
+			String copt = mResult.mCustomConfigOptions;
+			if(copt.startsWith("#")) {
+				int until = copt.indexOf('\n');
+				copt = copt.substring(until+1);
+			}
+				
+			log(copt);
 		}
 
 		if(mResult.mAuthenticationType==VpnProfile.TYPE_KEYSTORE) {
-- 
cgit v1.2.3