From a3ef0aa6e89fbc53f856aaa9b1335ccf3488c308 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Sat, 1 Feb 2020 12:09:41 +0000
Subject: [PATCH] Honour the isLogin flag in theme.js

Horrendous hack to fix the fact that if 'match system theme' was
set, the isLogin flag in the controller would do nothing because
theme.js would have decided to use the system theme before even
asking what the theme setting was.
---
 src/theme.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/theme.js b/src/theme.js
index 1ba87a2048..774148dacd 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -21,6 +21,7 @@ export const DEFAULT_THEME = "light";
 import Tinter from "./Tinter";
 import dis from "./dispatcher";
 import SettingsStore, {SettingLevel} from "./settings/SettingsStore";
+import ThemeController from "./settings/controllers/ThemeController";
 
 export class ThemeWatcher {
     static _instance = null;
@@ -82,12 +83,22 @@ export class ThemeWatcher {
     getEffectiveTheme() {
         // Dev note: Much of this logic is replicated in the GeneralUserSettingsTab
 
+        // XXX: checking the isLight flag here makes checking it in the ThemeController
+        // itself completely redundant since we just override the result here and we're
+        // now effectively just using the ThemeController as a place to store the static
+        // variable. The system theme setting probably ought to have an equivalent
+        // controller that honours the same flag, although probablt better would be to
+        // have the theme logic in one place rather than split between however many
+        // different places.
+        if (ThemeController.isLogin) return 'light';
+
         // If the user has specifically enabled the system matching option (excluding default),
         // then use that over anything else. We pick the lowest possible level for the setting
         // to ensure the ordering otherwise works.
         const systemThemeExplicit = SettingsStore.getValueAt(
             SettingLevel.DEVICE, "use_system_theme", null, false, true);
         if (systemThemeExplicit) {
+            console.log("returning explicit system theme");
             if (this._preferDark.matches) return 'dark';
             if (this._preferLight.matches) return 'light';
         }
@@ -97,7 +108,10 @@ export class ThemeWatcher {
         // level for the setting to ensure the ordering otherwise works.
         const themeExplicit = SettingsStore.getValueAt(
             SettingLevel.DEVICE, "theme", null, false, true);
-        if (themeExplicit) return themeExplicit;
+        if (themeExplicit) {
+            console.log("returning explicit theme: " + themeExplicit);
+            return themeExplicit;
+        }
 
         // If the user hasn't really made a preference in either direction, assume the defaults of the
         // settings and use those.
@@ -105,6 +119,7 @@ export class ThemeWatcher {
             if (this._preferDark.matches) return 'dark';
             if (this._preferLight.matches) return 'light';
         }
+        console.log("returning theme value");
         return SettingsStore.getValue('theme');
     }