Fix streak notifications manager not checking notification permission status

Stepic/Legacy/Controllers/RegistrationSignIn/AuthNavigationViewController.swift

@@ -9,7 +9,7 @@
 import UIKit
 
 final class AuthNavigationViewController: UINavigationController {
-    private let streaksAlertPresentationManager = StreaksAlertPresentationManager(source: .login)
+    private static let streaksAlertPresentationManager = StreaksAlertPresentationManager(source: .login)
     private let notificationSuggestionManager = NotificationSuggestionManager()
     private let userActivitiesAPI = UserActivitiesAPI()
 
@@ -21,7 +21,7 @@ final class AuthNavigationViewController: UINavigationController {
 
     weak var source: UIViewController? {
         didSet {
-            streaksAlertPresentationManager.controller = source
+            Self.streaksAlertPresentationManager.controller = source
         }
     }
     var success: (() -> Void)?
@@ -31,7 +31,7 @@ final class AuthNavigationViewController: UINavigationController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        streaksAlertPresentationManager.controller = source
+        Self.streaksAlertPresentationManager.controller = source
         navigationBar.shadowImage = UIImage()
         navigationBar.setBackgroundImage(UIImage(), for: .default)
     }
@@ -47,7 +47,7 @@ final class AuthNavigationViewController: UINavigationController {
                 after: .login
             )
             if canShowAlert && userActivity.didSolveThisWeek {
-                self.streaksAlertPresentationManager.suggestStreak(
+                Self.streaksAlertPresentationManager.suggestStreak(
                     streak: userActivity.currentStreak
                 )
             }

Stepic/Legacy/Model/Managers/StreaksAlertPresentationManager.swift

@@ -61,14 +61,18 @@ final class StreaksAlertPresentationManager {
         let source = self.source.analyticsSource
         presenter.onPositiveCallback = { [weak self] in
             PreferencesContainer.notifications.allowStreaksNotifications = true
+            NotificationCenter.default.post(
+                name: .streaksAlertPresentationManagerDidChangeStreakNotifications,
+                object: nil
+            )
 
             StepikAnalytics.shared.send(
                 .streaksSuggestionSucceeded(index: NotificationSuggestionManager().streakAlertShownCnt)
             )
             NotificationAlertsAnalytics(source: source).reportCustomAlertInteractionResult(.yes)
 
-            // When we are suggesting streak with the `Source` of .login type - `self` will be deallocated at this point.
-            // In this case we need to register for remote notifications.
+            assert(self != nil)
+
             if let strongSelf = self {
                 strongSelf.notifyPressed()
             } else {
@@ -101,7 +105,12 @@ final class StreaksAlertPresentationManager {
         }
     }
 
-    private func didChooseTime() {}
+    private func didChooseTime() {
+        NotificationCenter.default.post(
+            name: .streaksAlertPresentationManagerDidChangeStreakNotifications,
+            object: PreferencesContainer.notifications.streaksNotificationStartHourUTC
+        )
+    }
 
     private func selectStreakNotificationTime() {
         guard let controller = controller else {
@@ -144,7 +153,6 @@ final class StreaksAlertPresentationManager {
             case .denied:
                 self?.showSettingsAlert()
             }
-            return
         }
     }
 
@@ -205,3 +213,8 @@ final class StreaksAlertPresentationManager {
         }
     }
 }
+
+extension Foundation.Notification.Name {
+    static let streaksAlertPresentationManagerDidChangeStreakNotifications = Foundation.Notification
+        .Name("streaksAlertPresentationManagerDidChangeStreakNotifications")
+}

Stepic/Sources/Modules/NewProfileSubmodules/StreakNotifications/NewProfileStreakNotificationsInteractor.swift

@@ -47,6 +47,12 @@ final class NewProfileStreakNotificationsInteractor: NewProfileStreakNotificatio
             name: .notificationsRegistrationServiceDidUpdatePermissionStatus,
             object: nil
         )
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(self.onStreaksAlertPresentationManagerDidChangeStreakNotifications),
+            name: .streaksAlertPresentationManagerDidChangeStreakNotifications,
+            object: nil
+        )
 
         self.checkPermissionStatus()
     }
@@ -86,14 +92,24 @@ final class NewProfileStreakNotificationsInteractor: NewProfileStreakNotificatio
 
     // MARK: Private API
 
-    private func presentStreakNotifications(isStreakNotificationsEnabled: Bool? = nil) {
-        let isOn = isStreakNotificationsEnabled ?? self.streakNotificationsStorageManager.isStreakNotificationsEnabled
-        self.presenter.presentStreakNotifications(
-            response: .init(
-                isStreakNotificationsEnabled: isOn,
-                streaksNotificationsStartHour: self.streakNotificationsStorageManager.streakNotificationsStartHourUTC
+    private func presentStreakNotifications(permissionStatus: NotificationPermissionStatus? = nil) {
+        firstly { () -> Guarantee<NotificationPermissionStatus> in
+            if let permissionStatus = permissionStatus {
+                return .value(permissionStatus)
+            }
+            return NotificationPermissionStatus.current
+        }.done { permissionStatus in
+            let isOn = permissionStatus.isRegistered
+                && self.streakNotificationsStorageManager.isStreakNotificationsEnabled
+            let startHour = self.streakNotificationsStorageManager.streakNotificationsStartHourUTC
+
+            self.presenter.presentStreakNotifications(
+                response: .init(
+                    isStreakNotificationsEnabled: isOn,
+                    streaksNotificationsStartHour: startHour
+                )
             )
-        )
+        }
     }
 
     private func setStreakNotificationsEnabled(_ enabled: Bool) {
@@ -121,12 +137,14 @@ final class NewProfileStreakNotificationsInteractor: NewProfileStreakNotificatio
 
     @objc
     private func onPermissionStatusUpdate(_ notification: Foundation.Notification) {
-        guard let permissionStatus = notification.object as? NotificationPermissionStatus else {
-            return
+        if let permissionStatus = notification.object as? NotificationPermissionStatus {
+            self.presentStreakNotifications(permissionStatus: permissionStatus)
         }
+    }
 
-        let isOn = self.streakNotificationsStorageManager.isStreakNotificationsEnabled && permissionStatus.isRegistered
-        self.presentStreakNotifications(isStreakNotificationsEnabled: isOn)
+    @objc
+    private func onStreaksAlertPresentationManagerDidChangeStreakNotifications() {
+        self.doStreakNotificationsLoad(request: .init())
     }
 
     private func checkPermissionStatus() {

Stepic/Sources/Modules/Quizzes/BaseQuiz/BaseQuizViewController.swift

@@ -13,6 +13,8 @@ final class BaseQuizViewController: UIViewController, ControllerWithStepikPlaceh
 
     lazy var baseQuizView = self.view as? BaseQuizView
 
+    private lazy var streaksAlertPresentationManager = StreaksAlertPresentationManager(source: .submission)
+
     private var quizAssembly: QuizAssembly
 
     private var childQuizModuleInput: QuizInputProtocol? { self.quizAssembly.moduleInput }
@@ -151,9 +153,8 @@ extension BaseQuizViewController: BaseQuizViewControllerProtocol {
     }
 
     func displayStreakAlert(viewModel: BaseQuiz.StreakAlertPresentation.ViewModel) {
-        let streaksAlertPresentationManager = StreaksAlertPresentationManager(source: .submission)
-        streaksAlertPresentationManager.controller = self
-        streaksAlertPresentationManager.suggestStreak(streak: viewModel.streak)
+        self.streaksAlertPresentationManager.controller = self
+        self.streaksAlertPresentationManager.suggestStreak(streak: viewModel.streak)
     }
 }