mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Do not include archived messages in unread count.

main
Greyson Parrelli 2022-12-02 12:38:23 -05:00
rodzic 1bca2f06bd
commit 21592ca5c0
1 zmienionych plików z 2 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt
Wyświetl plik

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