From cd8c75bc781cef0d699bcd655d3e39055e0684c0 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 17 Nov 2023 13:11:40 -0500
Subject: [PATCH] Fix issues with some japanese numbers being detected as
 shortcodes.

---
 .../securesms/phonenumbers/PhoneNumberFormatter.java           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java b/app/src/main/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java
index 9262cb1a51..c36ab50bfe 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java
@@ -127,6 +127,7 @@ public class PhoneNumberFormatter {
     }
 
     if (isShortCode(bareNumber, localCountryCode)) {
+      Log.i(TAG, "Shortcode detected.");
       return bareNumber;
     }
 
@@ -165,7 +166,7 @@ public class PhoneNumberFormatter {
   private boolean isShortCode(@NonNull String bareNumber, String localCountryCode) {
     try {
       Phonenumber.PhoneNumber parsedNumber = phoneNumberUtil.parse(bareNumber, localCountryCode);
-      return ShortNumberInfo.getInstance().isPossibleShortNumberForRegion(parsedNumber, localCountryCode);
+      return ShortNumberInfo.getInstance().isValidShortNumberForRegion(parsedNumber, localCountryCode);
     } catch (NumberParseException e) {
       return false;
     }