Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-19 21:38:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add CLDR region as a dimension

Browse Source
This commit is contained in:
Jon Chambers
2022-08-26 11:18:41 -04:00
committed by Jon Chambers
parent b280c768a4
commit 3bb4709563
2 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
service/src/main/java/org/whispersystems/textsecuregcm/util/Util.java
View File

@@ -8,6 +8,7 @@ import com.google.i18n.phonenumbers.NumberParseException;
import com.google.i18n.phonenumbers.PhoneNumberUtil;
import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat;
import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
import org.apache.commons.lang3.StringUtils;
import java.time.Clock;
import java.time.Duration;
import java.time.temporal.ChronoField;
@@ -21,6 +22,7 @@ import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
public class Util {
@@ -79,10 +81,11 @@ public class Util {
else return "0";
}
@Nullable
public static String getRegion(final String number) {
try {
final PhoneNumber phoneNumber = PHONE_NUMBER_UTIL.parse(number, null);
return PHONE_NUMBER_UTIL.getRegionCodeForNumber(phoneNumber);
return StringUtils.defaultIfBlank(PHONE_NUMBER_UTIL.getRegionCodeForNumber(phoneNumber), "ZZ");
} catch (final NumberParseException e) {
return "ZZ";
}