bug fixes

or-else · or-else · commit 9fecafdc8fe2 · 2022-06-21T09:56:46.000-07:00
diff --git a/app/src/main/java/co/tinode/tindroid/db/BaseDb.java b/app/src/main/java/co/tinode/tindroid/db/BaseDb.java
@@ -88,6 +88,8 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         db.execSQL(MessageDb.DROP_INDEX);
         db.execSQL(MessageDb.DROP_INDEX_2);
         db.execSQL(MessageDb.DROP_TABLE);
+        // Remove this on the next release.
+        db.execSQL("DROP TABLE IF EXISTS edit_history");
         db.execSQL(SubscriberDb.DROP_INDEX);
         db.execSQL(SubscriberDb.DROP_TABLE);
         db.execSQL(UserDb.DROP_INDEX);
diff --git a/app/src/main/java/co/tinode/tindroid/db/MessageDb.java b/app/src/main/java/co/tinode/tindroid/db/MessageDb.java
@@ -153,7 +153,7 @@ public class MessageDb implements BaseColumns {
             "CREATE UNIQUE INDEX " + INDEX_NAME_2 +
                     " ON " + TABLE_NAME + " (" +
                     COLUMN_NAME_TOPIC_ID + "," +
-                    COLUMN_NAME_EFFECTIVE_SEQ + " DESC WHERE " + COLUMN_NAME_EFFECTIVE_SEQ + " IS NOT NULL)";
+                    COLUMN_NAME_EFFECTIVE_SEQ + " DESC) WHERE " + COLUMN_NAME_EFFECTIVE_SEQ + " IS NOT NULL";
     /**
      * Save message to DB
      *

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public class MessageDb implements BaseColumns {`
`153`	`153`	`"CREATE UNIQUE INDEX " + INDEX_NAME_2 +`
`154`	`154`	`" ON " + TABLE_NAME + " (" +`
`155`	`155`	`COLUMN_NAME_TOPIC_ID + "," +`
`156`		`- COLUMN_NAME_EFFECTIVE_SEQ + " DESC WHERE " + COLUMN_NAME_EFFECTIVE_SEQ + " IS NOT NULL)";`
	`156`	`+ COLUMN_NAME_EFFECTIVE_SEQ + " DESC) WHERE " + COLUMN_NAME_EFFECTIVE_SEQ + " IS NOT NULL";`
`157`	`157`	`/**`
`158`	`158`	`* Save message to DB`
`159`	`159`	`*`