From e6ceb55092b3ac32a32870a9e3406913f19657e4 Mon Sep 17 00:00:00 2001
From: Nicholas Tinsley <nicholas@signal.org>
Date: Mon, 10 Jun 2024 14:29:54 -0400
Subject: [PATCH] Match account deletion number by short NSN.

Fixes #13583.
---
 .../thoughtcrime/securesms/delete/DeleteAccountViewModel.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountViewModel.java
index 74c6bec5e8..ce4990059d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountViewModel.java
@@ -102,7 +102,8 @@ public class DeleteAccountViewModel extends ViewModel {
     number.setCountryCode(countryCode);
     number.setNationalNumber(nationalNumber);
 
-    if (PhoneNumberUtil.getInstance().isNumberMatch(number, Recipient.self().requireE164()) == PhoneNumberUtil.MatchType.EXACT_MATCH) {
+    final PhoneNumberUtil.MatchType matchType = PhoneNumberUtil.getInstance().isNumberMatch(number, Recipient.self().requireE164());
+    if (matchType == PhoneNumberUtil.MatchType.EXACT_MATCH || matchType == PhoneNumberUtil.MatchType.SHORT_NSN_MATCH || matchType == PhoneNumberUtil.MatchType.NSN_MATCH) {
       events.setValue(DeleteAccountEvent.ConfirmDeletion.INSTANCE);
     } else {
       events.setValue(DeleteAccountEvent.NotAMatch.INSTANCE);