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

Do not include archived messages in unread count.

Browse source
This commit is contained in:
Greyson Parrelli 2022-12-02 12:38:23 -05:00
parent 1bca2f06bd
commit 21592ca5c0
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt
View file

@ -520,6 +520,7 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
val allCount: Long = readableDatabase
.select("SUM($UNREAD_COUNT)")
.from(TABLE_NAME)
.where("$ARCHIVED = ?", 0)
.run()
.use { cursor ->
if (cursor.moveToFirst()) {
@ -532,7 +533,7 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
val forcedUnreadCount: Long = readableDatabase
.select("COUNT(*)")
.from(TABLE_NAME)
.where("$READ = ?", ReadStatus.FORCED_UNREAD.serialize())
.where("$READ = ? AND $ARCHIVED = ?", ReadStatus.FORCED_UNREAD.serialize(), 0)
.run()
.use { cursor ->
if (cursor.moveToFirst()) {