mirror of
https://github.com/signalapp/Signal-Android.git
synced 2025-12-24 04:58:45 +00:00
Fix call link deletion from calls tab.
This commit is contained in:
committed by
Greyson Parrelli
parent
064cbf0b01
commit
a75e4688a3
@@ -348,7 +348,7 @@ class CallLinkTable(context: Context, databaseHelper: SignalDatabase) : Database
|
||||
}
|
||||
|
||||
fun deleteNonAdminCallLinks(roomIds: Set<CallLinkRoomId>) {
|
||||
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<CallLinkRoomId>): Set<CallLink> {
|
||||
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)
|
||||
|
||||
Reference in New Issue
Block a user