Fix notification preferences

home-assistant · Sep 23, 2016 · 17c32f1 · 17c32f1
1 parent bf86f57
commit 17c32f1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/HomeAssistant/HAAPI.swift b/HomeAssistant/HAAPI.swift
@@ -770,7 +770,8 @@ public class HomeAssistantAPI {
     }
 
     var notificationsEnabled : Bool {
-        return PermissionScope().statusNotifications() == .authorized && prefs.string(forKey: "endpointARN") != nil
+//        return PermissionScope().statusNotifications() == .authorized && prefs.string(forKey: "endpointARN") != nil
+        return prefs.string(forKey: "endpointARN") != nil
     }
 
     var enabledPermissions : [String] {

diff --git a/HomeAssistant/SettingsViewController.swift b/HomeAssistant/SettingsViewController.swift
@@ -249,7 +249,6 @@ class SettingsViewController: FormViewController {
             <<< ButtonRow("enableNotifications"){
                 $0.title = "Enable notifications"
                 $0.hidden = Condition(booleanLiteral: HomeAssistantAPI.sharedInstance.notificationsEnabled)
-                $0.evaluateHidden()
             }.onCellSelection { cell, row in
                 let pscope = PermissionScope()
 
@@ -274,8 +273,7 @@ class SettingsViewController: FormViewController {
 
             <<< ButtonRow("notificationSettings") {
                 $0.title = "Notification Settings"
-                $0.hidden = Condition(booleanLiteral: (HomeAssistantAPI.sharedInstance.notificationsEnabled == true))
-                $0.evaluateHidden()
+                $0.hidden = Condition(booleanLiteral: !HomeAssistantAPI.sharedInstance.notificationsEnabled)
                 $0.presentationMode = .show(controllerProvider: ControllerProvider.callback {
                     print("HomeAssistantAPI.sharedInstance.notificationsEnabled", HomeAssistantAPI.sharedInstance.notificationsEnabled)
                     let view = SettingsDetailViewController()