From 215643556b278ea02728a9128be24ce73f69960e Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Mon, 1 May 2023 09:07:02 -0500 Subject: [PATCH] Paper over rare crash with any colour theme --- .../java/eu/siacs/conversations/utils/ThemeHelper.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java b/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java index 97351477a2a82d1626e1afe20dd6af0d37054c0a..3ce5f16de1ac2aa397b83502436738dbb5522901 100644 --- a/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java @@ -37,6 +37,7 @@ import android.content.res.TypedArray; import android.content.res.loader.ResourcesLoader; import android.os.Build; import android.preference.PreferenceManager; +import android.util.Log; import android.util.TypedValue; import android.widget.TextView; @@ -50,6 +51,7 @@ import com.google.android.material.snackbar.Snackbar; import java.util.HashMap; import eu.siacs.conversations.R; +import eu.siacs.conversations.Config; import eu.siacs.conversations.ui.SettingsActivity; public class ThemeHelper { @@ -65,7 +67,11 @@ public class ThemeHelper { if (colors.isEmpty()) return colors; ResourcesLoader loader = ColorResourcesLoaderCreator.create(context, colors); - if (loader != null) context.getResources().addLoaders(loader); + try { + if (loader != null) context.getResources().addLoaders(loader); + } catch (final IllegalArgumentException e) { + Log.w(Config.LOGTAG, "Custom colour failed: " + e); + } return colors; }