TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-25 15:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return optional for telephone number region name for the unknown case to be localized.

Browse Source
This commit is contained in:
Alan Evans
2020-12-09 15:44:45 -04:00
parent ec8793c6fe
commit a8dd81eace
4 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/PhoneNumberFormatter.java
View File

@@ -12,6 +12,8 @@ import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat;
import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
import org.whispersystems.libsignal.logging.Log;
import org.whispersystems.libsignal.util.guava.Optional;
import org.whispersystems.signalservice.internal.util.Util;
import java.util.Locale;
import java.util.regex.Pattern;
@@ -113,9 +115,22 @@ public class PhoneNumberFormatter {
}
}
public static String getRegionDisplayName(String regionCode) {
return (regionCode == null || regionCode.equals("ZZ") || regionCode.equals(PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY))
? "Unknown country" : new Locale("", regionCode).getDisplayCountry(Locale.getDefault());
/**
* @deprecated Use {@link #getRegionDisplayName} as it can be localized when the region is not found.
*/
@Deprecated
public static String getRegionDisplayNameLegacy(String regionCode) {
return getRegionDisplayName(regionCode).or("Unknown country");
}
public static Optional<String> getRegionDisplayName(String regionCode) {
if (regionCode != null && !regionCode.equals("ZZ") && !regionCode.equals(PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY)) {
String displayCountry = new Locale("", regionCode).getDisplayCountry(Locale.getDefault());
if (!Util.isEmpty(displayCountry)) {
return Optional.of(displayCountry);
}
}
return Optional.absent();
}
public static String formatE164(String countryCode, String number) {