improve notifications

home-assistant · Apr 23, 2017 · fc4aa02 · fc4aa02
1 parent 49ec1bb
commit fc4aa02
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/HomeAssistant/AppDelegate.swift b/HomeAssistant/AppDelegate.swift
@@ -306,6 +306,6 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
                                        // swiftlint:disable:next line_length
                                        withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
         print("Received notification!")
-        completionHandler([.alert, .badge, .sound])
+        return completionHandler([.alert, .badge, .sound])
     }
 }
diff --git a/HomeAssistant/HAAPI.swift b/HomeAssistant/HAAPI.swift
@@ -1013,10 +1013,7 @@ public class HomeAssistantAPI {
     }
 
     var notificationsEnabled: Bool {
-        //        return PermissionScope().statusNotifications() == .authorized && prefs.string(forKey: "pushID") != nil
-        return prefs.string(forKey: "pushID") != nil
-        //        print("PermissionScope().statusNotifications()", PermissionScope().statusNotifications())
-        //        return PermissionScope().statusNotifications() == .authorized
+        return prefs.bool(forKey: "notificationsEnabled")
     }
 
     var iosComponentLoaded: Bool {

diff --git a/HomeAssistant/Views/SettingsViewController.swift b/HomeAssistant/Views/SettingsViewController.swift
@@ -339,6 +339,8 @@ class SettingsViewController: FormViewController {
                         if finished {
                             print("Notifications Permissions finished!", finished, results)
                             if results[0].status == .authorized {
+                                prefs.setValue(true, forKey: "notificationsEnabled")
+                                prefs.synchronize()
                                 HomeAssistantAPI.sharedInstance.setupPush()
                                 row.hidden = true
                                 row.evaluateHidden()
@@ -349,6 +351,9 @@ class SettingsViewController: FormViewController {
                                 notifyPlatformLoadedRow.hidden = false
                                 notifyPlatformLoadedRow.evaluateHidden()
                                 self.tableView.reloadData()
+                            } else {
+                                prefs.setValue(false, forKey: "notificationsEnabled")
+                                prefs.synchronize()
                             }
                         }
                     }, cancelled: { _ -> Void in
@@ -360,8 +365,6 @@ class SettingsViewController: FormViewController {
                 $0.title = L10n.Settings.DetailsSection.NotificationSettingsRow.title
                 $0.hidden = Condition(booleanLiteral: !HomeAssistantAPI.sharedInstance.notificationsEnabled)
                 $0.presentationMode = .show(controllerProvider: ControllerProvider.callback {
-                    print("HomeAssistantAPI.sharedInstance.notificationsEnabled",
-                          HomeAssistantAPI.sharedInstance.notificationsEnabled)
                     let view = SettingsDetailViewController()
                     view.detailGroup = "notifications"
                     return view

diff --git a/MapNotificationContentExtension/Info.plist b/MapNotificationContentExtension/Info.plist
@@ -22,15 +22,15 @@
 	<string>3</string>
 	<key>NSExtension</key>
 	<dict>
-		<key>NSExtensionMainStoryboard</key>
-		<string>MainInterface</string>
 		<key>NSExtensionAttributes</key>
 		<dict>
 			<key>UNNotificationExtensionCategory</key>
 			<string>map</string>
 			<key>UNNotificationExtensionInitialContentSizeRatio</key>
 			<real>1</real>
 		</dict>
+		<key>NSExtensionMainStoryboard</key>
+		<string>MainInterface</string>
 		<key>NSExtensionPointIdentifier</key>
 		<string>com.apple.usernotifications.content-extension</string>
 	</dict>