altosdroid: Switch storage to media dir

[fw/altos] / altosdroid / app / src / main / java / org / altusmetrum / AltosDroid / AltosDroidPreferencesBackend.java

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java
index 5d836f5dceeb7f21f9711b0c77beffadfe5fadbc..170353ab4838098035f6e1dc37768bb0ee41f9f4 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java
@@ -78,15 +78,18 @@ public class AltosDroidPreferencesBackend extends AltosPreferencesBackend {
 
        public String getString(String key, String def) {
                String  ret;
 
        public String getString(String key, String def) {
                String  ret;

-               ret = prefs.getString(key, def);
-//             AltosDebug.debug("AltosDroidPreferencesBackend get string %s:\n", key);
-//             if (ret == null)
-//                     AltosDebug.debug("      (null)\n");
-//             else {
-//                     String[] lines = ret.split("\n");
-//                     for (String l : lines)
-//                             AltosDebug.debug("        %s\n", l);
-//             }
+               if (key.equals(AltosPreferences.logdirPreference))
+                       ret = null;
+               else
+                       ret = prefs.getString(key, def);
+               AltosDebug.debug("AltosDroidPreferencesBackend get string %s:\n", key);
+               if (ret == null)
+                       AltosDebug.debug("      (null)\n");
+               else {
+                       String[] lines = ret.split("\n");
+                       for (String l : lines)
+                               AltosDebug.debug("        %s\n", l);
+               }

                return ret;
        }
 
                return ret;
        }
 


@@ -135,7 +138,7 @@ public class AltosDroidPreferencesBackend extends AltosPreferencesBackend {
        }
 
        public File homeDirectory() {
        }
 
        public File homeDirectory() {

-               return Environment.getExternalStorageDirectory();
+               return context.getExternalMediaDirs()[0];

        }
 
        public void debug(String format, Object ... arguments) {
        }
 
        public void debug(String format, Object ... arguments) {