projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Get rid of manual JSON encoding stuff
[fw/altos]
/
altoslib
/
AltosPreferences.java
diff --git
a/altoslib/AltosPreferences.java
b/altoslib/AltosPreferences.java
index 51fc4205e6b79fa987376ee068cb5b80a30d7ac3..569aaa5481f863f9e8558fe8207aaff0f8ef89f1 100644
(file)
--- a/
altoslib/AltosPreferences.java
+++ b/
altoslib/AltosPreferences.java
@@
-365,7
+365,7
@@
public class AltosPreferences {
public static void set_state(AltosState state) {
synchronized(backend) {
public static void set_state(AltosState state) {
synchronized(backend) {
- backend.putJson(String.format(statePreferenceFormat, state.serial),
state.json(
));
+ backend.putJson(String.format(statePreferenceFormat, state.serial),
new AltosJson(state
));
backend.putInt(statePreferenceLatest, state.serial);
flush_preferences();
}
backend.putInt(statePreferenceLatest, state.serial);
flush_preferences();
}
@@
-405,10
+405,12
@@
public class AltosPreferences {
public static AltosState state(int serial) {
synchronized(backend) {
try {
public static AltosState state(int serial) {
synchronized(backend) {
try {
- return AltosState.fromJson(backend.getJson(String.format(statePreferenceFormat, serial)));
+ AltosJson json = backend.getJson(String.format(statePreferenceFormat, serial));
+ if (json != null)
+ return (AltosState) (json.make(AltosState.class));
} catch (Exception e) {
} catch (Exception e) {
- return null;
}
}
+ return null;
}
}
}
}