Fix FCM disabling. Fixes #475.

home-assistant · Feb 12, 2020 · 7295449 · 7295449
1 parent e25ca84
commit 7295449
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Shared/Settings/SettingsStore.swift b/Shared/Settings/SettingsStore.swift
@@ -137,10 +137,12 @@ public class SettingsStore {
 
     public var notificationsEnabled: Bool {
         get {
+            if prefs.object(forKey: "messagingEnabled") != nil && prefs.bool(forKey: "messagingEnabled") == false {
+                return false
+            }
             return prefs.bool(forKey: "notificationsEnabled")
         }
         set {
-            prefs.set(newValue, forKey: "messagingEnabled")
             prefs.set(newValue, forKey: "notificationsEnabled")
         }
     }