From 6bdfa11b66bcc99f1eeee01cfaf3c0dd653b27dd Mon Sep 17 00:00:00 2001 From: AsamK Date: Wed, 15 Dec 2021 21:54:53 +0100 Subject: [PATCH] Prevent NPE if no locale is configured Fixes #833 --- lib/src/main/java/org/asamk/signal/manager/util/Utils.java | 3 +++ 1 file changed, 3 insertions(+) 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) { -- 2.50.1