Merge remote-tracking branch 'mjb/master'

[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / AltosDroidPreferences.java

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
index 7ba328f4e2d8bbf00d61d442750956084d8d2d42..fd4b0768ac33f8d60e55946be7f0d6bb1ad39d09 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
@@ -17,10 +17,13 @@
 
 package org.altusmetrum.AltosDroid;
 
+import java.io.File;
 import java.util.Map;
 import android.content.Context;
 import android.content.SharedPreferences;
-import org.altusmetrum.AltosLib.*;
+import android.os.Environment;
+
+import org.altusmetrum.altoslib_1.*;
 
 public class AltosDroidPreferences implements AltosPreferencesBackend {
        public final static String        NAME    = "org.altusmetrum.AltosDroid";
@@ -38,19 +41,13 @@ public class AltosDroidPreferences implements AltosPreferencesBackend {
                editor  = prefs.edit();
        }
 
-       public AltosPreferencesBackend node(String key) {
-               return new AltosDroidPreferences(context, key);
-       }
-
-       public void flush() {
-               editor.apply();
+       public String[] keys() {
+               Map<String, ?> all = prefs.getAll();
+               return (String[])all.keySet().toArray();
        }
 
-       public String[] keys() {
-               Map<String, ?> data = prefs.getAll();
-               String[] keys = new String[data.size()];
-               data.keySet().toArray(keys);
-               return keys;
+       public AltosPreferencesBackend node(String key) {
+               return new AltosDroidPreferences(context, key);
        }
 
        public boolean nodeExists(String key) {
@@ -94,4 +91,11 @@ public class AltosDroidPreferences implements AltosPreferencesBackend {
                editor.remove(key);
        }
 
+       public void flush() {
+               editor.apply();
+       }
+
+       public File homeDirectory() {
+               return Environment.getExternalStorageDirectory();
+       }
 }