X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroidPreferencesBackend.java;h=2e6ccb34e2227277910bbf1237392ff404980287;hp=75676e284909d4e72038ccb0e827d75cb0f4d1fc;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hpb=cb23b992be8ba40c97d8988c134a814a13ccd58c

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java
index 75676e28..2e6ccb34 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -24,9 +25,9 @@ import android.content.SharedPreferences;
 import android.os.Environment;
 import android.util.*;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_11.*;
 
-public class AltosDroidPreferencesBackend implements AltosPreferencesBackend {
+public class AltosDroidPreferencesBackend extends AltosPreferencesBackend {
 	public final static String        NAME    = "org.altusmetrum.AltosDroid";
 	private Context                   context = null;
 	private SharedPreferences         prefs   = null;
@@ -44,10 +45,17 @@ public class AltosDroidPreferencesBackend implements AltosPreferencesBackend {
 
 	public String[] keys() {
 		Map<String, ?> all = prefs.getAll();
-		return (String[])all.keySet().toArray();
+		Object[] ao = all.keySet().toArray();
+
+		String[] as = new String[ao.length];
+		for (int i = 0; i < ao.length; i++)
+			as[i] = (String) ao[i];
+		return as;
 	}
 
 	public AltosPreferencesBackend node(String key) {
+		if (!nodeExists(key))
+			putBoolean(key, true);
 		return new AltosDroidPreferencesBackend(context, key);
 	}
 
@@ -104,6 +112,7 @@ public class AltosDroidPreferencesBackend implements AltosPreferencesBackend {
 	}
 
 	public void remove(String key) {
+		AltosDebug.debug("remove preference %s\n", key);
 		editor.remove(key);
 	}
 
@@ -114,4 +123,8 @@ public class AltosDroidPreferencesBackend implements AltosPreferencesBackend {
 	public File homeDirectory() {
 		return Environment.getExternalStorageDirectory();
 	}
+
+	public void debug(String format, Object ... arguments) {
+		AltosDebug.debug(format, arguments);
+	}
 }