System Automation fix (#9510)

- Latest Chrome's background doesn't support matchMedia. - Did it work for Firefox for the past year?
darkreader · Aug 10, 2022 · 9636997 · 9636997
1 parent 573be4f
commit 9636997
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/src/background/extension.ts b/src/background/extension.ts
@@ -146,14 +146,9 @@ export class Extension {
                     }
                     break;
                 }
-                if (isFirefox) {
-                    // BUG: Firefox background page always matches initial color scheme.
-                    isAutoDark = this.wasLastColorSchemeDark == null
-                        ? isSystemDarkModeEnabled()
-                        : this.wasLastColorSchemeDark;
-                } else {
-                    isAutoDark = isSystemDarkModeEnabled();
-                }
+                isAutoDark = this.wasLastColorSchemeDark == null
+                    ? isSystemDarkModeEnabled()
+                    : this.wasLastColorSchemeDark;
                 break;
             case 'location': {
                 const {latitude, longitude} = UserStorage.settings.location;
@@ -392,9 +387,7 @@ export class Extension {
 
     private static onColorSchemeChange = async (isDark: boolean) => {
         this.MV3syncSystemColorStateManager(isDark);
-        if (isFirefox) {
-            this.wasLastColorSchemeDark = isDark;
-        }
+        this.wasLastColorSchemeDark = isDark;
         await this.loadData();
         if (UserStorage.settings.automation.mode !== 'system') {
             return;

diff --git a/src/background/tab-manager.ts b/src/background/tab-manager.ts
@@ -183,7 +183,7 @@ export default class TabManager {
                 case MessageType.UI_COLOR_SCHEME_CHANGE:
                     // fallthrough
                 case MessageType.CS_COLOR_SCHEME_CHANGE:
-                    onColorSchemeChange(message.data);
+                    onColorSchemeChange(message.data.isDark);
                     break;
 
                 case MessageType.UI_SAVE_FILE: {