From a75e4688a3d7b9e98879d5448543bc50c84bf75a Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Fri, 17 Jan 2025 14:09:27 -0400 Subject: [PATCH] Fix call link deletion from calls tab. --- .../org/thoughtcrime/securesms/database/CallLinkTable.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/CallLinkTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/CallLinkTable.kt index ce9225f525..dd4e8052e4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/CallLinkTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/CallLinkTable.kt @@ -348,7 +348,7 @@ class CallLinkTable(context: Context, databaseHelper: SignalDatabase) : Database } fun deleteNonAdminCallLinks(roomIds: Set) { - val queries = SqlUtil.buildCollectionQuery(ROOM_ID, roomIds) + val queries = SqlUtil.buildCollectionQuery(ROOM_ID, roomIds.map { it.serialize() }) queries.forEach { writableDatabase.delete(TABLE_NAME) @@ -368,7 +368,7 @@ class CallLinkTable(context: Context, databaseHelper: SignalDatabase) : Database } fun getAdminCallLinks(roomIds: Set): Set { - val queries = SqlUtil.buildCollectionQuery(ROOM_ID, roomIds) + val queries = SqlUtil.buildCollectionQuery(ROOM_ID, roomIds.map { it.serialize() }) return queries.map { writableDatabase @@ -386,7 +386,7 @@ class CallLinkTable(context: Context, databaseHelper: SignalDatabase) : Database .where("$ADMIN_KEY IS NULL") .run() } else { - SqlUtil.buildCollectionQuery(ROOM_ID, roomIds, collectionOperator = SqlUtil.CollectionOperator.NOT_IN).forEach { + SqlUtil.buildCollectionQuery(ROOM_ID, roomIds.map { it.serialize() }, collectionOperator = SqlUtil.CollectionOperator.NOT_IN).forEach { writableDatabase.delete(TABLE_NAME) .where("${it.where} AND $ADMIN_KEY IS NULL", it.whereArgs) .run() @@ -404,7 +404,7 @@ class CallLinkTable(context: Context, databaseHelper: SignalDatabase) : Database .readToList { CallLinkDeserializer.deserialize(it) } .toSet() } else { - SqlUtil.buildCollectionQuery(ROOM_ID, roomIds, collectionOperator = SqlUtil.CollectionOperator.NOT_IN).map { + SqlUtil.buildCollectionQuery(ROOM_ID, roomIds.map { it.serialize() }, collectionOperator = SqlUtil.CollectionOperator.NOT_IN).map { writableDatabase .select() .from(TABLE_NAME)