diff options
| -rw-r--r-- | src/com/android/gallery3d/filtershow/presets/ImagePreset.java | 18 | ||||
| -rw-r--r-- | src/com/android/photos/data/PhotoDatabase.java | 4 |
2 files changed, 4 insertions, 18 deletions
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java index 5a0100df4..4ec39f765 100644 --- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java +++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java @@ -59,7 +59,7 @@ public class ImagePreset { private boolean mPartialRendering = false; private Rect mPartialRenderingBounds; - private static final boolean DEBUG = false; + private static final boolean DEBUG = true; public ImagePreset() { } @@ -689,7 +689,7 @@ public class ImagePreset { Log.w(LOGTAG,"UNKNOWN FILTER! "+name); return false; } - filter.deSerializeRepresentation(read(sreader)); + filter.deSerializeRepresentation(sreader); addFilter(filter); } sreader.endObject(); @@ -703,18 +703,4 @@ public class ImagePreset { FiltersManager filtersManager = FiltersManager.getManager(); return filtersManager.createFilterFromName(name); } - - String[][] read(JsonReader reader) throws IOException { - ArrayList <String[]> al = new ArrayList<String[]>(); - - reader.beginObject(); - - while (reader.hasNext()) { - String[]kv = { reader.nextName(),reader.nextString()}; - al.add(kv); - - } - reader.endObject(); - return al.toArray(new String[al.size()][]); - } } diff --git a/src/com/android/photos/data/PhotoDatabase.java b/src/com/android/photos/data/PhotoDatabase.java index 1f15c5bdc..0c7b22730 100644 --- a/src/com/android/photos/data/PhotoDatabase.java +++ b/src/com/android/photos/data/PhotoDatabase.java @@ -34,7 +34,7 @@ import java.util.List; public class PhotoDatabase extends SQLiteOpenHelper { @SuppressWarnings("unused") private static final String TAG = PhotoDatabase.class.getSimpleName(); - static final int DB_VERSION = 2; + static final int DB_VERSION = 3; private static final String SQL_CREATE_TABLE = "CREATE TABLE "; @@ -80,7 +80,7 @@ public class PhotoDatabase extends SQLiteOpenHelper { private static final String[][] CREATE_ACCOUNT = { { Accounts._ID, "INTEGER PRIMARY KEY AUTOINCREMENT" }, - { Accounts.ACCOUNT_NAME, "TEXT NOT NULL" }, + { Accounts.ACCOUNT_NAME, "TEXT UNIQUE NOT NULL" }, }; @Override |