From af1f45a6e4b8cea38d01600662b6662882aa53c2 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Thu, 20 Aug 2020 09:19:00 +1000 Subject: [PATCH] Fix received message hash values storage --- .../securesms/loki/database/LokiAPIDatabase.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt b/src/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt index 58728ed199..a3a3ddb54a 100644 --- a/src/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt +++ b/src/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt @@ -215,9 +215,9 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database( override fun getReceivedMessageHashValues(publicKey: String): Set? { val database = databaseHelper.readableDatabase - val query = "$Companion.publicKey = ?" + val query = "${Companion.publicKey} = ?" return database.get(receivedMessageHashValuesTable2, query, arrayOf( publicKey )) { cursor -> - val receivedMessageHashValuesAsString = cursor.getString(cursor.getColumnIndexOrThrow(receivedMessageHashValues)) + val receivedMessageHashValuesAsString = cursor.getString(cursor.getColumnIndexOrThrow(Companion.receivedMessageHashValues)) receivedMessageHashValuesAsString.split("-").toSet() } } @@ -225,8 +225,8 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database( override fun setReceivedMessageHashValues(publicKey: String, newValue: Set) { val database = databaseHelper.writableDatabase val receivedMessageHashValuesAsString = newValue.joinToString("-") - val row = wrap(mapOf( Companion.publicKey to publicKey, receivedMessageHashValues to receivedMessageHashValuesAsString )) - val query = "$Companion.publicKey = ?" + val row = wrap(mapOf( Companion.publicKey to publicKey, Companion.receivedMessageHashValues to receivedMessageHashValuesAsString )) + val query = "${Companion.publicKey} = ?" database.insertOrUpdate(receivedMessageHashValuesTable2, row, query, arrayOf( publicKey )) }