From b70908e61aa811053efc484961dcb8d37198e598 Mon Sep 17 00:00:00 2001 From: jubb Date: Thu, 29 Apr 2021 17:28:41 +1000 Subject: [PATCH] fix: gotta fix some more up --- .../thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt index eedff1a964..85481432d7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt @@ -60,7 +60,7 @@ class LokiMessageDatabase(context: Context, helper: SQLCipherOpenHelper) : Datab fun getMessageID(serverID: Long, threadID: Long): Pair? { val database = databaseHelper.readableDatabase - return database.get("$messageIDTable INNER JOIN $messageThreadMappingTable ON $messageIDTable.$messageID = $messageThreadMappingTable.$messageID", + return database.get("$messageIDTable INNER JOIN $messageThreadMappingTable ON $messageIDTable.$messageID = $messageThreadMappingTable.$messageID AND $messageIDTable.${Companion.serverID} = $messageThreadMappingTable.${Companion.serverID}", "${Companion.serverID} = ? AND ${Companion.threadID} = ?", arrayOf(serverID.toString(),threadID.toString())) { cursor -> cursor.getLong(messageID) to (cursor.getInt(messageType) == SMS_TYPE)