Skip to content

Commit 36a8a39

Browse files
alex-signalcody-signal
authored andcommitted
Only display latest call link event in calls tab.
1 parent 9912a5f commit 36a8a39

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

  • app/src/main/java/org/thoughtcrime/securesms/database

app/src/main/java/org/thoughtcrime/securesms/database/CallTable.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1260,7 +1260,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
12601260
}
12611261

12621262
val projection = if (isCount) {
1263-
"COUNT(*),"
1263+
"COUNT(*) OVER() as count,"
12641264
} else {
12651265
"p.$ID, p.$TIMESTAMP, $EVENT, $DIRECTION, $PEER, p.$TYPE, $CALL_ID, $MESSAGE_ID, $RINGER, $LOCAL_JOINED, $GROUP_CALL_ACTIVE, children, in_period, ${MessageTable.BODY},"
12661266
}
@@ -1366,6 +1366,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
13661366
LEFT JOIN ${MessageTable.TABLE_NAME} ON ${MessageTable.TABLE_NAME}.${MessageTable.ID} = $MESSAGE_ID
13671367
LEFT JOIN ${GroupTable.TABLE_NAME} ON ${GroupTable.TABLE_NAME}.${GroupTable.RECIPIENT_ID} = ${RecipientTable.TABLE_NAME}.${RecipientTable.ID}
13681368
WHERE true_parent = p.$ID ${if (queryClause.where.isNotEmpty()) "AND ${queryClause.where}" else ""}
1369+
GROUP BY CASE WHEN p.type = 4 THEN p.peer ELSE p._id END
13691370
ORDER BY p.$TIMESTAMP DESC
13701371
$offsetLimit
13711372
"""

0 commit comments

Comments
 (0)