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

Fix receipts for stories.

Browse source
This commit is contained in:
Greyson Parrelli 2023-04-17 09:57:13 -04:00 • committed by Cody Henthorne
parent deeaf2ba2e
commit 3264a0a795
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4372,17 +4372,26 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
SET
${receiptType.columnName} = ${receiptType.columnName} + 1,
$RECEIPT_TIMESTAMP = CASE
WHEN ${receiptType.columnName} = 0 THEN MAX($RECEIPT_TIMESTAMP, ?)
WHEN ${receiptType.columnName} = 0 THEN MAX($RECEIPT_TIMESTAMP, $receiptSentTimestamp)
ELSE $RECEIPT_TIMESTAMP
END
WHERE
$DATE_SENT = ? AND
$DATE_SENT = $targetTimestamp AND
$FROM_RECIPIENT_ID = ? AND
($TO_RECIPIENT_ID = ? OR EXISTS (SELECT 1 FROM ${GroupTable.TABLE_NAME} WHERE ${GroupTable.TABLE_NAME}.${GroupTable.RECIPIENT_ID} = $TO_RECIPIENT_ID))
(
$TO_RECIPIENT_ID = ? OR
EXISTS (
SELECT 1
FROM ${RecipientTable.TABLE_NAME}
WHERE
${RecipientTable.TABLE_NAME}.${RecipientTable.ID} = $TO_RECIPIENT_ID AND
${RecipientTable.TABLE_NAME}.${RecipientTable.GROUP_TYPE} != ${RecipientTable.GroupType.NONE.id}
)
)
$qualifierWhere
RETURNING $ID, $THREAD_ID, $STORY_TYPE
""",
buildArgs(receiptSentTimestamp, targetTimestamp, Recipient.self().id, receiptAuthor)
buildArgs(Recipient.self().id, receiptAuthor)
).forEach { cursor ->
val messageId = cursor.requireLong(ID)
val threadId = cursor.requireLong(THREAD_ID)