From 25e339aa1af5e6a6f6350fa458ff76cbb10da54f Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 24 Jan 2025 12:21:02 -0500
Subject: [PATCH] Include empty chats with non-default expiration times in
 backups.

---
 .../backup/v2/database/ThreadTableArchiveExtensions.kt          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/ThreadTableArchiveExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/ThreadTableArchiveExtensions.kt
index b180a7587b..8e80896c23 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/ThreadTableArchiveExtensions.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/ThreadTableArchiveExtensions.kt
@@ -35,7 +35,7 @@ fun ThreadTable.getThreadsForBackup(db: SignalDatabase, includeImageWallpapers:
       FROM ${ThreadTable.TABLE_NAME}
         LEFT OUTER JOIN ${RecipientTable.TABLE_NAME} ON ${ThreadTable.TABLE_NAME}.${ThreadTable.RECIPIENT_ID} = ${RecipientTable.TABLE_NAME}.${RecipientTable.ID}
       WHERE
-        ${ThreadTable.ACTIVE} = 1 AND
+        (${ThreadTable.ACTIVE} = 1 OR ${RecipientTable.MESSAGE_EXPIRATION_TIME} > 0) AND
         ${RecipientTable.TABLE_NAME}.${RecipientTable.TYPE} NOT IN (${RecipientTable.RecipientType.DISTRIBUTION_LIST.id}, ${RecipientTable.RecipientType.CALL_LINK.id})
     """
   val cursor = readableDatabase.query(query)