From 943a0ced37a26bce4f1f0933b117907bd989173a Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Tue, 22 Oct 2024 10:45:03 -0500
Subject: [PATCH] Need to join with cheogram when getting messages

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

diff --git a/build.gradle b/build.gradle
index db0a8c35b96a5d26df982a3fe5be85f7c6e406e9..19e7695293b6c110799fe433407aafdf12527250 100644
--- a/build.gradle
+++ b/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
             }
         }
 
diff --git a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
index 084590c00ac22fa2def2f88493157e31959b5d0d..b31c041e80c6f2abc1520fba0a9cf51fee69f6ca 100644
--- a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
+++ b/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) {