From: AsamK <asamk@gmx.de>
Date: Wed, 15 Dec 2021 20:54:53 +0000 (+0100)
Subject: Prevent NPE if no locale is configured
X-Git-Tag: v0.10.1~63
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/6bdfa11b66bcc99f1eeee01cfaf3c0dd653b27dd?ds=sidebyside

Prevent NPE if no locale is configured

Fixes #833
---

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 806a3bb3..60e0c3a4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
@@ -76,6 +76,9 @@ public class Utils {
 
     public static Locale getDefaultLocale() {
         final var locale = Locale.getDefault();
+        if (locale == null) {
+            return null;
+        }
         try {
             Locale.LanguageRange.parse(locale.getLanguage() + "-" + locale.getCountry());
         } catch (IllegalArgumentException e) {