From ca17b50d35c9a62dbd2b5698542936f1e00155e7 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 6 Dec 2024 11:54:42 -0500
Subject: [PATCH] Fix possible backup validation error.

---
 .../backup/v2/database/RecipientTableArchiveExtensions.kt     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/RecipientTableArchiveExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/RecipientTableArchiveExtensions.kt
index 3b35bd9474..95f1a915a2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/RecipientTableArchiveExtensions.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/RecipientTableArchiveExtensions.kt
@@ -65,8 +65,8 @@ fun RecipientTable.getContactsForBackup(selfId: Long): ContactArchiveExporter {
       """
       ${RecipientTable.TYPE} = ? AND (
         ${RecipientTable.ACI_COLUMN} NOT NULL OR
-        (${RecipientTable.PNI_COLUMN} NOT NULL AND ${RecipientTable.E164} NOT NULL) OR
-        ${RecipientTable.E164} NOT NULL
+        (${RecipientTable.PNI_COLUMN} NOT NULL AND ${RecipientTable.E164} NOT NULL AND ${RecipientTable.E164} != 0) OR
+        (${RecipientTable.E164} NOT NULL AND ${RecipientTable.E164} != 0)
       )
       """,
       RecipientTable.RecipientType.INDIVIDUAL.id