diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-01-16 19:57:52 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-01-16 19:57:52 +0100 |
| commit | 1e043dcd18f03d39b7984cb7b77b5e06da13cea6 (patch) | |
| tree | d32b82a71af30b30e0ebedf17a201a32939c3928 | |
| parent | 09c26d3d7204e0d89f809e439216787fb5aebaf9 (diff) | |
Fix bug when importing on 4.4
--HG--
extra : amend_source : 39d68a0f95dec4744a56576009bb7f0ae08e0f17
| -rw-r--r-- | icsopenvpn.iml | 18 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/activities/ConfigConverter.java | 8 |
2 files changed, 15 insertions, 11 deletions
diff --git a/icsopenvpn.iml b/icsopenvpn.iml index ad327925..62aab261 100644 --- a/icsopenvpn.iml +++ b/icsopenvpn.iml @@ -3,10 +3,10 @@ <component name="FacetManager"> <facet type="android" name="Android"> <configuration> - <option name="SELECTED_BUILD_VARIANT" value="Debug" /> + <option name="SELECTED_BUILD_VARIANT" value="debug" /> <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> - <option name="COMPILE_JAVA_TASK_NAME" value="compileDebug" /> - <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleTest" /> + <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" /> + <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" /> <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" /> <option name="ALLOW_USER_CONFIGURATION" value="false" /> <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" /> @@ -25,14 +25,14 @@ <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/debug" isTestSource="false" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/build/source/r/test" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/source/rs/test" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/res/rs/test" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/build/source/r/test/debug" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test/debug" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test/debug" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/source/rs/test/debug" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/res/rs/test/debug" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" /> diff --git a/src/de/blinkt/openvpn/activities/ConfigConverter.java b/src/de/blinkt/openvpn/activities/ConfigConverter.java index 4fa66449..78eb4a2c 100644 --- a/src/de/blinkt/openvpn/activities/ConfigConverter.java +++ b/src/de/blinkt/openvpn/activities/ConfigConverter.java @@ -262,14 +262,18 @@ public class ConfigConverter extends ListActivity { // Do a little hackish dance for the Android File Importer // /document/primary:ovpn/openvpn-imt.conf + if (path.indexOf(':')!=-1) { String possibleDir = path.substring(path.indexOf(':')+1,path.length()); - possibleDir.substring(0,possibleDir.lastIndexOf('/')); - dirlist.add(new File(sdcard,possibleDir)); + possibleDir = possibleDir.substring(0,possibleDir.lastIndexOf('/')); + + dirlist.add(new File(sdcard,possibleDir)); } dirlist.add(new File(path)); + + } dirlist.add(sdcard); dirlist.add(root); |