Merge branch 'release/9.0.28'

Author: MichaelRocks

README.md

@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-  implementation 'io.michaelrocks:libphonenumber-android:9.0.27'
+  implementation 'io.michaelrocks:libphonenumber-android:9.0.28'
 }
 ```
 

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "io.michaelrocks"
-version = "9.0.27"
+version = "9.0.28"
 
 tasks.register<Delete>("clean") {
   delete(rootProject.layout.buildDirectory)

library/src/main/assets/io/michaelrocks/libphonenumber/android/data/PhoneNumberMetadataProto_BW

@@ -1687,7 +1687,8 @@ public String formatOutOfCountryCallingNumber(PhoneNumber number,
    * @return the formatted phone number in its original number format
    */
   public String formatInOriginalFormat(PhoneNumber number, String regionCallingFrom) {
-    if (number.hasRawInput() && !hasFormattingPatternForNumber(number)) {
+    NumberFormat formatRule = chooseFormattingPatternForNumber(number);
+    if (number.hasRawInput() && formatRule == null) {
       // We check if we have the formatting pattern because without that, we might format the number
       // as a group without national prefix.
       return number.getRawInput();
@@ -1727,12 +1728,6 @@ public String formatInOriginalFormat(PhoneNumber number, String regionCallingFro
           formattedNumber = nationalFormat;
           break;
         }
-        // Metadata cannot be null here because getNddPrefixForRegion() (above) returns null if
-        // there is no metadata for the region.
-        PhoneMetadata metadata = getMetadataForRegion(regionCode);
-        String nationalNumber = getNationalSignificantNumber(number);
-        NumberFormat formatRule =
-            chooseFormattingPatternForNumber(metadata.getNumberFormatList(), nationalNumber);
         // The format rule could still be null here if the national number was 0 and there was no
         // raw input (this should not be possible for numbers generated by the phonenumber library
         // as they would also not have a country calling code and we would have exited earlier).
@@ -1801,18 +1796,32 @@ private boolean rawInputContainsNationalPrefix(String rawInput, String nationalP
     return false;
   }
 
-  private boolean hasFormattingPatternForNumber(PhoneNumber number) {
+  private NumberFormat chooseFormattingPatternForNumber(PhoneNumber number) {
     int countryCallingCode = number.getCountryCode();
     String phoneNumberRegion = getRegionCodeForCountryCode(countryCallingCode);
     PhoneMetadata metadata =
         getMetadataForRegionOrCallingCode(countryCallingCode, phoneNumberRegion);
     if (metadata == null) {
-      return false;
+      return null;
     }
     String nationalNumber = getNationalSignificantNumber(number);
-    NumberFormat formatRule =
-        chooseFormattingPatternForNumber(metadata.getNumberFormatList(), nationalNumber);
-    return formatRule != null;
+    return chooseFormattingPatternForNumber(metadata.getNumberFormatList(), nationalNumber);
+  }
+
+  NumberFormat chooseFormattingPatternForNumber(List<NumberFormat> availableFormats,
+      String nationalNumber) {
+    for (NumberFormat numFormat : availableFormats) {
+      int size = numFormat.getLeadingDigitsPatternCount();
+      if (size == 0 || regexCache.getPatternForRegex(
+          // We always use the last leading_digits_pattern, as it is the most detailed.
+          numFormat.getLeadingDigitsPattern(size - 1)).matcher(nationalNumber).lookingAt()) {
+        Matcher m = regexCache.getPatternForRegex(numFormat.getPattern()).matcher(nationalNumber);
+        if (m.matches()) {
+          return numFormat;
+        }
+      }
+    }
+    return null;
   }
 
   /**
@@ -2001,22 +2010,6 @@ private String formatNsn(String number,
         : formatNsnUsingPattern(number, formattingPattern, numberFormat, carrierCode);
   }
 
-  NumberFormat chooseFormattingPatternForNumber(List<NumberFormat> availableFormats,
-                                                String nationalNumber) {
-    for (NumberFormat numFormat : availableFormats) {
-      int size = numFormat.getLeadingDigitsPatternCount();
-      if (size == 0 || regexCache.getPatternForRegex(
-              // We always use the last leading_digits_pattern, as it is the most detailed.
-              numFormat.getLeadingDigitsPattern(size - 1)).matcher(nationalNumber).lookingAt()) {
-        Matcher m = regexCache.getPatternForRegex(numFormat.getPattern()).matcher(nationalNumber);
-        if (m.matches()) {
-          return numFormat;
-        }
-      }
-    }
-    return null;
-  }
-
   // Simple wrapper of formatNsnUsingPattern for the common case of no carrier code.
   String formatNsnUsingPattern(String nationalNumber,
                                NumberFormat formattingPattern,