From 73b3676b3e3464110949b5d65729936d717a635f Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 18 Sep 2026 12:02:56 -0400
Subject: [PATCH] Always use ACI_ONLY cert for numberless accounts.

---
 .../thoughtcrime/securesms/crypto/SealedSenderAccessUtil.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/SealedSenderAccessUtil.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/SealedSenderAccessUtil.java
index 00eb18c5d6..1af0990d2a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/crypto/SealedSenderAccessUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/SealedSenderAccessUtil.java
@@ -173,7 +173,9 @@ public class SealedSenderAccessUtil {
   }
 
   private static @NonNull CertificateType getUnidentifiedAccessCertificateType() {
-    if (SignalStore.phoneNumberPrivacy().isPhoneNumberSharingEnabled()) {
+    if (SignalStore.account().isPhoneNumberless()) {
+      return CertificateType.ACI_ONLY;
+    } else if (SignalStore.phoneNumberPrivacy().isPhoneNumberSharingEnabled()) {
       return CertificateType.ACI_AND_E164;
     } else {
       return CertificateType.ACI_ONLY;