From f41e0ec176f7500dbd341d0ab68ad7be6e37ac59 Mon Sep 17 00:00:00 2001 From: tom79 Date: Sun, 25 Aug 2019 11:30:30 +0200 Subject: [PATCH] Prepares database #274 --- .../app/fedilab/android/sqlite/Sqlite.java | 22 ++++++++++++++++++- .../android/sqlite/StatusCacheDAO.java | 2 +- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/sqlite/Sqlite.java b/app/src/main/java/app/fedilab/android/sqlite/Sqlite.java index c285ba073..d4bafcfad 100644 --- a/app/src/main/java/app/fedilab/android/sqlite/Sqlite.java +++ b/app/src/main/java/app/fedilab/android/sqlite/Sqlite.java @@ -49,7 +49,7 @@ import static android.content.Context.MODE_PRIVATE; public class Sqlite extends SQLiteOpenHelper { - public static final int DB_VERSION = 32; + public static final int DB_VERSION = 33; public static final String DB_NAME = "mastodon_etalab_db"; public static SQLiteDatabase db; private static Sqlite sInstance; @@ -300,6 +300,22 @@ public class Sqlite extends SQLiteOpenHelper { + static final String COL_NOTIFICATION_ID = "NOTIFICATION_ID"; + static final String COL_STATUS_ID_CACHE = "STATUS_ID_CACHE"; + private static final String CREATE_TABLE_NOTIFICATIONS = "CREATE TABLE " + + TABLE_TIMELINE_CACHE + "(" + + COL_ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " + + COL_NOTIFICATION_ID + " TEXT NOT NULL, " + + COL_INSTANCE + " TEXT NOT NULL, " + + COL_USER_ID + " TEXT NOT NULL, " + + COL_ACCOUNT + " TEXT NOT NULL, " + + COL_TYPE + " TEXT NOT NULL, " + + COL_STATUS_ID + " TEXT NOT NULL, " + + COL_STATUS_ID_CACHE + " INTEGER, " + + COL_CREATED_AT + " TEXT NOT NULL)"; + + + public Sqlite(Context context, String name, SQLiteDatabase.CursorFactory factory, int version) { super(context, name, factory, version); @@ -330,6 +346,7 @@ public class Sqlite extends SQLiteOpenHelper { db.execSQL(CREATE_TABLE_TRACKING_BLOCK); db.execSQL(CREATE_TABLE_TIMELINES); db.execSQL(CREATE_TABLE_TIMELINE_CACHE); + db.execSQL(CREATE_TABLE_NOTIFICATIONS); } @Override @@ -459,6 +476,9 @@ public class Sqlite extends SQLiteOpenHelper { db.execSQL(insert); db.execSQL("DROP TABLE "+TABLE_USER_ACCOUNT); db.execSQL("ALTER TABLE "+TABLE_USER_ACCOUNT_TEMP + " RENAME TO "+ TABLE_USER_ACCOUNT); + + case 32: + db.execSQL(CREATE_TABLE_NOTIFICATIONS); default: break; } diff --git a/app/src/main/java/app/fedilab/android/sqlite/StatusCacheDAO.java b/app/src/main/java/app/fedilab/android/sqlite/StatusCacheDAO.java index 09b67a9ee..8a5e2affd 100644 --- a/app/src/main/java/app/fedilab/android/sqlite/StatusCacheDAO.java +++ b/app/src/main/java/app/fedilab/android/sqlite/StatusCacheDAO.java @@ -48,7 +48,7 @@ public class StatusCacheDAO { //Type of cache public static int BOOKMARK_CACHE = 0; public static int ARCHIVE_CACHE = 1; - + public static int NOTIFICATION_CACHE = 2; public StatusCacheDAO(Context context, SQLiteDatabase db) { //Creation of the DB with tables