fixes #1257 - next try, only setting for default import dir

1 files changed, 16 insertions, 1 deletions

diff --git a/main/src/cgeo/geocaching/Settings.java b/main/src/cgeo/geocaching/Settings.java
index 9e5a8a4..92241c2 100644
--- a/main/src/cgeo/geocaching/Settings.java
+++ b/main/src/cgeo/geocaching/Settings.java
@@ -22,6 +22,7 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.os.Environment;
 import android.preference.PreferenceManager;
 
 import java.util.Locale;
@@ -95,6 +96,7 @@ public final class Settings {
     private static final String KEY_LAST_TRACKABLE_ACTION = "trackableaction";
     private static final String KEY_SHARE_AFTER_EXPORT = "shareafterexport";
     private static final String KEY_GPX_EXPORT_DIR = "gpxExportDir";
+    private static final String KEY_GPX_IMPORT_DIR = "gpxImportDir";
 
     private final static int unitsMetric = 1;
 
@@ -1152,7 +1154,7 @@ public final class Settings {
     }
 
     public static String getGpxExportDir() {
-        return sharedPrefs.getString(KEY_GPX_EXPORT_DIR, "/sdcard/gpx");
+        return sharedPrefs.getString(KEY_GPX_EXPORT_DIR, Environment.getExternalStorageDirectory().getPath() + "/gpx");
     }
 
     public static void setGpxExportDir(final String gpxExportDir) {
@@ -1164,6 +1166,19 @@ public final class Settings {
         });
     }
 
+    public static String getGpxImportDir() {
+        return sharedPrefs.getString(KEY_GPX_IMPORT_DIR, Environment.getExternalStorageDirectory().getPath() + "/gpx");
+    }
+
+    public static void setGpxImportDir(final String gpxImportDir) {
+        editSharedSettings(new PrefRunnable() {
+            @Override
+            public void edit(Editor edit) {
+                edit.putString(KEY_GPX_IMPORT_DIR, gpxImportDir);
+            }
+        });
+    }
+
     public static boolean getShareAfterExport() {
         return sharedPrefs.getBoolean(KEY_SHARE_AFTER_EXPORT, true);
     }