From 6743861630fbf7a7842dc2c79272c24188d0bd17 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 9 Jun 2022 12:40:35 -0300
Subject: [PATCH] Account for archival and meaningful message status in unread
 count query.

---
 .../org/thoughtcrime/securesms/database/ThreadDatabase.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
index 005c7cb22b..cf27ff43b7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -519,7 +519,7 @@ public class ThreadDatabase extends Database {
   public long getUnreadThreadCount() {
     SQLiteDatabase db         = databaseHelper.getSignalReadableDatabase();
     String[]       projection = SqlUtil.buildArgs("COUNT(*)");
-    String         where      = READ + " != 1";
+    String         where      = READ + " != " + ReadStatus.READ.serialize() + " AND " + ARCHIVED + " = 0 AND " + MEANINGFUL_MESSAGES + " != 0";
 
     try (Cursor cursor = db.query(TABLE_NAME, projection, where, null, null, null, null)) {
       if (cursor != null && cursor.moveToFirst()) {