From d13c16392630354c7296c31b343720e0a0f0f571 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@blinkt.de>
Date: Thu, 31 May 2012 22:20:51 +0200
Subject: - fix a few more strings - add editing xxx title to cfonig settings

---
 src/de/blinkt/openvpn/ConfigConverter.java | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(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 8aebc664..5e0a6eb3 100644
--- a/src/de/blinkt/openvpn/ConfigConverter.java
+++ b/src/de/blinkt/openvpn/ConfigConverter.java
@@ -5,6 +5,8 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.List;
+import java.util.Vector;
 
 import android.app.Activity;
 import android.app.ListActivity;
@@ -24,6 +26,8 @@ public class ConfigConverter extends ListActivity {
 	private VpnProfile mResult;
 	private ArrayAdapter<String> mArrayAdapter;
 
+	private List<String> mPathsegments;
+
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -91,7 +95,20 @@ public class ConfigConverter extends ListActivity {
 		// Try diffent path relative to /mnt/sdcard
 		File sdcard = Environment.getExternalStorageDirectory();
 		File root = new File("/");
-		File[] dirlist = {root, sdcard};
+		
+		Vector<File> dirlist = new Vector<File>();
+
+		for(int i=mPathsegments.size()-1;i >=0 ;i--){
+			String path = "";
+			for (int j = 0;j<=i;j++) {
+				path += "/" + mPathsegments.get(j);
+			}
+			dirlist.add(new File(path));
+		}
+		dirlist.add(sdcard);
+		dirlist.add(root);
+		
+		
 		String[] fileparts = filename.split("/");
 		for(File rootdir:dirlist){
 			String suffix="";
@@ -159,6 +176,8 @@ public class ConfigConverter extends ListActivity {
 				log(R.string.importing_config,data.toString());
 				try {
 					InputStream is = getContentResolver().openInputStream(data);
+					mPathsegments = data.getPathSegments();
+					
 					doImport(is);
 				} catch (FileNotFoundException e) {
 					log(R.string.import_content_resolve_error);
-- 
cgit v1.2.3