X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroidPreferencesBackend.java;h=2ff711f57fee683abfe82a011b9bdc5c5307c2e5;hp=be41ae7cf35b345b157d11127730c73971618bdc;hb=d6445b3739ac2c5dd040efdb97317a6b2a48044a;hpb=8c212cd5bfa03f71a31d84bd0051314e77d88461

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java
index be41ae7c..2ff711f5 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java
@@ -22,8 +22,9 @@ import java.util.Map;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Environment;
+import android.util.*;
 
-import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosDroidPreferencesBackend implements AltosPreferencesBackend {
 	public final static String        NAME    = "org.altusmetrum.AltosDroid";
@@ -43,7 +44,12 @@ 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) {
@@ -71,6 +77,16 @@ public class AltosDroidPreferencesBackend implements AltosPreferencesBackend {
 		return prefs.getString(key, def);
 	}
 
+	public byte[] getBytes(String key, byte[] def) {
+		String save = prefs.getString(key, null);
+
+		if (save == null)
+			return def;
+
+		byte[] bytes = Base64.decode(save, Base64.DEFAULT);
+		return bytes;
+	}
+
 	public void putBoolean(String key, boolean value) {
 		editor.putBoolean(key, value);
 	}
@@ -87,7 +103,13 @@ public class AltosDroidPreferencesBackend implements AltosPreferencesBackend {
 		editor.putString(key, value);
 	}
 
+	public void putBytes(String key, byte[] bytes) {
+		String save = Base64.encodeToString(bytes, Base64.DEFAULT);
+		editor.putString(key, save);
+	}
+
 	public void remove(String key) {
+		AltosDebug.debug("remove preference %s\n", key);
 		editor.remove(key);
 	}