empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix potential stack overflow during thread deletion.

Browse source
This commit is contained in:
Greyson Parrelli 2023-12-01 16:07:21 -05:00 • committed by Cody Henthorne
parent a8a7019411
commit c54e2388ce
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
View file

@ -3106,16 +3106,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
return deleteMessage(messageId, threadId) return deleteMessage(messageId, threadId)
} }
fun deleteMessage(messageId: Long, notify: Boolean): Boolean { private fun deleteMessage(messageId: Long, threadId: Long = getThreadIdForMessage(messageId), notify: Boolean = true, updateThread: Boolean = true): Boolean {
val threadId = getThreadIdForMessage(messageId)
return deleteMessage(messageId, threadId, notify)
}
fun deleteMessage(messageId: Long, threadId: Long): Boolean {
return deleteMessage(messageId, threadId, true)
}
private fun deleteMessage(messageId: Long, threadId: Long, notify: Boolean): Boolean {
Log.d(TAG, "deleteMessage($messageId)") Log.d(TAG, "deleteMessage($messageId)")
attachments.deleteAttachmentsForMessage(messageId) attachments.deleteAttachmentsForMessage(messageId)
@ -3129,7 +3120,12 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
calls.updateCallEventDeletionTimestamps() calls.updateCallEventDeletionTimestamps()
threads.setLastScrolled(threadId, 0) threads.setLastScrolled(threadId, 0)
val threadDeleted = threads.update(threadId, false)
val threadDeleted = if (updateThread) {
threads.update(threadId, false)
} else {
false
}
if (notify) { if (notify) {
notifyConversationListeners(threadId) notifyConversationListeners(threadId)
@ -3336,7 +3332,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
OptimizeMessageSearchIndexJob.enqueue() OptimizeMessageSearchIndexJob.enqueue()
} }
fun deleteThreads(threadIds: Set<Long>) { private fun deleteThreads(threadIds: Set<Long>) {
Log.d(TAG, "deleteThreads(count: ${threadIds.size})") Log.d(TAG, "deleteThreads(count: ${threadIds.size})")
writableDatabase.withinTransaction { db -> writableDatabase.withinTransaction { db ->
@ -3346,7 +3342,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
.where(query.where, query.whereArgs) .where(query.where, query.whereArgs)
.run() .run()
.forEach { cursor -> .forEach { cursor ->
deleteMessage(cursor.requireLong(ID), false) deleteMessage(cursor.requireLong(ID), notify = false, updateThread = false)
} }
} }
} }