From e62f5c90ea24e216fda0c63a310e6e499957ec91 Mon Sep 17 00:00:00 2001 From: Julien Herrero Date: Wed, 27 Apr 2022 12:10:43 +0200 Subject: [PATCH] Avoid crash on Locale check --- .../core/LocalizationActivityDelegate.kt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/localization/src/main/java/com/akexorcist/localizationactivity/core/LocalizationActivityDelegate.kt b/localization/src/main/java/com/akexorcist/localizationactivity/core/LocalizationActivityDelegate.kt index ffdfae1..77a5986 100644 --- a/localization/src/main/java/com/akexorcist/localizationactivity/core/LocalizationActivityDelegate.kt +++ b/localization/src/main/java/com/akexorcist/localizationactivity/core/LocalizationActivityDelegate.kt @@ -8,7 +8,7 @@ import android.content.res.Resources import android.os.BadParcelableException import android.os.Handler import android.os.Looper -import java.util.* +import java.util.Locale open class LocalizationActivityDelegate(val activity: Activity) { private lateinit var currentLanguage: Locale @@ -145,11 +145,14 @@ open class LocalizationActivityDelegate(val activity: Activity) { // Check if locale has change while this activity was run to back stack. private fun checkLocaleChange(context: Context) { - val defaultLocale = LanguageSetting.getDefaultLanguage(context) - val currentLocale = LanguageSetting.getLanguageWithDefault(context, defaultLocale) - if (!isCurrentLanguageSetting(currentLanguage, currentLocale)) { - isLocalizationChanged = true - notifyLanguageChanged() + if (this::currentLanguage.isInitialized) { + val defaultLocale = LanguageSetting.getDefaultLanguage(context) + val currentLocale = LanguageSetting.getLanguageWithDefault(context, defaultLocale) + + if (!isCurrentLanguageSetting(currentLanguage, currentLocale)) { + isLocalizationChanged = true + notifyLanguageChanged() + } } }