X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fapp%2Fsrc%2Fmain%2Fjava%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroidPreferencesBackend.java;h=170353ab4838098035f6e1dc37768bb0ee41f9f4;hb=a1b7357aa5bca6afb588b0bfb5cfe72c4d0255ef;hp=854fe86d6edaa6ab29c16fea6666c95ce151e458;hpb=8b53f860eb3171cd43e4bd0e440f2889bd810662;p=fw%2Faltos 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 854fe86d..170353ab 100644 --- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java +++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java @@ -25,7 +25,7 @@ import android.content.SharedPreferences; import android.os.Environment; import android.util.*; -import org.altusmetrum.altoslib_13.*; +import org.altusmetrum.altoslib_14.*; public class AltosDroidPreferencesBackend extends AltosPreferencesBackend { public final static String NAME = "org.altusmetrum.AltosDroid"; @@ -78,15 +78,18 @@ public class AltosDroidPreferencesBackend extends AltosPreferencesBackend { 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; } @@ -135,7 +138,7 @@ public class AltosDroidPreferencesBackend extends AltosPreferencesBackend { } public File homeDirectory() { - return Environment.getExternalStorageDirectory(); + return context.getExternalMediaDirs()[0]; } public void debug(String format, Object ... arguments) {