From ec34604ffc03b7e79f5bb5ac852fb49719969991 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 4 Feb 2022 19:26:14 -0500 Subject: [PATCH] Fix bug where GV1 storageIds were excluded from set. --- .../securesms/database/RecipientDatabase.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt index f3e5c68b4..4b982b0e4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt @@ -1016,8 +1016,14 @@ open class RecipientDatabase(context: Context, databaseHelper: SignalDatabase) : * @return All storage IDs for ContactRecords, excluding the ones that need to be deleted. */ fun getContactStorageSyncIdsMap(): Map { - val query = "$STORAGE_SERVICE_ID NOT NULL AND $ACI_COLUMN NOT NULL AND $ID != ? AND $GROUP_TYPE != ?" - val args = SqlUtil.buildArgs(Recipient.self().id, GroupType.SIGNAL_V2.id.toString()) + val query = """ + $STORAGE_SERVICE_ID NOT NULL AND ( + ($GROUP_TYPE = ? AND $ACI_COLUMN NOT NULL AND $ID != ?) + OR + $GROUP_TYPE IN (?) + ) + """.trimIndent() + val args = SqlUtil.buildArgs(GroupType.NONE.id, Recipient.self().id, GroupType.SIGNAL_V1.id) val out: MutableMap = HashMap() readableDatabase.query(TABLE_NAME, arrayOf(ID, STORAGE_SERVICE_ID, GROUP_TYPE), query, args, null, null, null).use { cursor ->