Fix profile fetch with an invalid LANG variable

[signal-cli] / lib / src / main / java / org / asamk / signal / manager / util / Utils.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
index c255eb436989ad44a1f5e48880c182a09b8b0b65..8cd114f82a098975e20f583a105c3c2a95787016 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
@@ -84,16 +84,16 @@ public class Utils {
                 theirIdentityKey);
     }
 
-    public static Locale getDefaultLocale() {
+    public static Locale getDefaultLocale(Locale fallback) {
         final var locale = Locale.getDefault();
         if (locale == null) {
-            return null;
+            return fallback;
         }
         try {
             Locale.LanguageRange.parse(locale.getLanguage() + "-" + locale.getCountry());
         } catch (IllegalArgumentException e) {
             logger.debug("Invalid locale, ignoring: {}", locale);
-            return null;
+            return fallback;
         }
 
         return locale;