Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 01:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add more fixes to the country picker.

Browse Source
This commit is contained in:
Michelle Tang
2025-02-06 16:19:43 -05:00
committed by GitHub
parent 254b0dacc3
commit 5173916699
24 changed files with 425 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/util/Util.java
View File

@@ -232,6 +232,11 @@ public class Util {
return Optional.ofNullable(simCountryIso != null ? simCountryIso.toUpperCase() : null);
}
public static @Nullable String getNetworkCountryIso(Context context) {
String networkCountryIso = ((TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE)).getNetworkCountryIso();
return networkCountryIso == null ? null : networkCountryIso.toUpperCase();
}
public static @NonNull <T> T firstNonNull(@Nullable T optional, @NonNull T fallback) {
return optional != null ? optional : fallback;
}