FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix race condition between getting and checking notification settings

Browse Source
This commit is contained in:
Angelo Stavrow 2020-08-02 08:47:14 -04:00
parent 88ac27ef50
commit a0fea768bf
No known key found for this signature in database
GPG Key ID: 1A49C7064E060EEE
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Mac/Inspector/WebFeedInspectorViewController.swift
View File

@ -60,22 +60,31 @@ final class WebFeedInspectorViewController: NSViewController, Inspector {
isNotifyAboutNewArticlesCheckBox.setNextState() isNotifyAboutNewArticlesCheckBox.setNextState()
return return
} }
if settings.authorizationStatus == .denied {
isNotifyAboutNewArticlesCheckBox.setNextState() UNUserNotificationCenter.current().getNotificationSettings { (settings) in
showNotificationsDeniedError() self.updateNotificationSettings()
} else if settings.authorizationStatus == .authorized {
feed?.isNotifyAboutNewArticles = (isNotifyAboutNewArticlesCheckBox?.state ?? .off) == .on ? true : false if settings.authorizationStatus == .denied {
} else { DispatchQueue.main.async {
UNUserNotificationCenter.current().requestAuthorization(options: [.badge, .sound, .alert]) { (granted, error) in self.isNotifyAboutNewArticlesCheckBox.setNextState()
self.updateNotificationSettings() self.showNotificationsDeniedError()
if granted { }
DispatchQueue.main.async { } else if settings.authorizationStatus == .authorized {
self.feed?.isNotifyAboutNewArticles = (self.isNotifyAboutNewArticlesCheckBox?.state ?? .off) == .on ? true : false DispatchQueue.main.async {
NSApplication.shared.registerForRemoteNotifications() self.feed?.isNotifyAboutNewArticles = (self.isNotifyAboutNewArticlesCheckBox?.state ?? .off) == .on ? true : false
} }
} else { } else {
DispatchQueue.main.async { UNUserNotificationCenter.current().requestAuthorization(options: [.badge, .sound, .alert]) { (granted, error) in
self.isNotifyAboutNewArticlesCheckBox.setNextState() self.updateNotificationSettings()
if granted {
DispatchQueue.main.async {
self.feed?.isNotifyAboutNewArticles = (self.isNotifyAboutNewArticlesCheckBox?.state ?? .off) == .on ? true : false
NSApplication.shared.registerForRemoteNotifications()
}
} else {
DispatchQueue.main.async {
self.isNotifyAboutNewArticlesCheckBox.setNextState()
}
} }
} }
} }