From 5bdf10b1bdea3404a43056764ca7a90d2dba5ec5 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 28 May 2025 12:26:09 -0400
Subject: [PATCH] Fix crash in storage sync validation.

---
 .../securesms/storage/StorageSyncValidations.java             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncValidations.java b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncValidations.java
index 104d0aa31a..8429030c32 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncValidations.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncValidations.java
@@ -177,8 +177,8 @@ public final class StorageSyncValidations {
         ContactRecord contact = insert.getProto().contact;
 
         if (self.requireAci().equals(ServiceId.ACI.parseOrNull(contact.aci)) ||
-            self.requirePni().equals(ServiceId.PNI.parseOrNull(contact.pni)) ||
-            self.requireE164().equals(contact.e164))
+            (self.getPni().isPresent() && self.requirePni().equals(ServiceId.PNI.parseOrNull(contact.pni))) ||
+            (self.getE164().isPresent() && self.requireE164().equals(contact.e164)))
         {
           throw new SelfAddedAsContactError();
         }