Don't invalidate theme if it hasn't changed

Change-Id: I0811218679409ac7e111aa7609736fc19de5236b
2020-10-08 16:05:07 +02:00 · 2020-10-08 16:05:07 +02:00 · 1231e6b0aa
parent 5e721d55f9
commit 1231e6b0aa
1 changed files with 6 additions and 2 deletions
--- a/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
@ -91,8 +91,12 @@ object ThemeUtils {
    }

    fun invalidateNightMode(context: Context) {
-        mThemeInitialized = false;
-        setApplicationTheme(context.applicationContext, getApplicationLightTheme(context), getApplicationDarkTheme(context))
+        val lightTheme = getApplicationLightTheme(context)
+        val darkTheme = getApplicationDarkTheme(context)
+        if (lightTheme != darkTheme && darkThemePossible(context)) {
+            mThemeInitialized = false;
+            setApplicationTheme(context.applicationContext, getApplicationLightTheme(context), getApplicationDarkTheme(context))
+        }
    }

    // init the theme