Need to join with cheogram when getting messages

Stephen Paul Weber created 1 year ago

Change summary

build.gradle                                                          | 2 
src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java | 4 
2 files changed, 3 insertions(+), 3 deletions(-)

Detailed changes

build.gradle

@@ -314,7 +314,7 @@ android {
             if (baseAbiVersionCode != null) {
                 output.versionCodeOverride = (100 * project.android.defaultConfig.versionCode) + baseAbiVersionCode
             } else {
-                output.versionCodeOverride = (100 * project.android.defaultConfig.versionCode) + 22
+                output.versionCodeOverride = (100 * project.android.defaultConfig.versionCode) + 23
             }
         }
 

src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java

@@ -1322,7 +1322,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
             final Conversation conversation, final String messageId) {
         final var db = this.getReadableDatabase();
         final String sql =
-                "select * from messages where conversationUuid=? and serverMsgId=? LIMIT 1";
+                "select * from messages LEFT JOIN cheogram.messages USING (uuid) where conversationUuid=? and serverMsgId=? LIMIT 1";
         final String[] args = {conversation.getUuid(), messageId};
         final Cursor cursor = db.rawQuery(sql, args);
         if (cursor == null) {
@@ -1342,7 +1342,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
             final Conversation conversation, final String messageId) {
         final var db = this.getReadableDatabase();
         final String sql =
-                "select * from messages where conversationUuid=? and (uuid=? OR remoteMsgId=?) LIMIT 1";
+                "select * from messages LEFT JOING cheogram.messages USING (uuid) where conversationUuid=? and (uuid=? OR remoteMsgId=?) LIMIT 1";
         final String[] args = {conversation.getUuid(), messageId, messageId};
         final Cursor cursor = db.rawQuery(sql, args);
         if (cursor == null) {