mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-03 06:55:59 +00:00
268d6c8ead
* Store the notifications switch per account Adds AccountSettings.enableNotifications and moves the app-wide value into the signed in accounts before they're restored: the first account takes it out of the app settings and the others get the same switch, so someone who turned notifications off keeps them off. * Add a notification service to every user session Each account's NotificationService sets its pusher when its notifications are on and deletes it when they're off (appending with multiple accounts), keeps the account's unread count and decides which of its delivered notifications to clear. It asks the NotificationManager, the only owner of the notification center, through actions: remove the notifications matching a rule, request authorization and the unread count. The UserSessionManager connects every live session's service to the manager, and flows and screens use the session's service instead of the manager, which leaves the flow parameters. * Route notifications by account Taps only open rooms of the active account for now, a tap made while restoring only opens once its account is the active one, replies are sent from the account they were made for, and signing out only clears that account's notifications unless it was the last one. The notification extension hides pushes for an account that signed out while other accounts are still signed in. * Turn notifications on and off for each account The notification settings switch is now saved per account, and each account's NotificationService sets or deletes its pusher when it changes, asking for permission when it's turned on. * Apply review suggestions to multi-account notifications Migration - Move the notifications switch with a single per-account migration, like 26.10.1 and 26.10.2, and drop its dedicated test. Notification manager and service - Follow each account's badge count publisher directly, removing the badge count action and the stored counts. - Only reset the badge and unregister from APNs when the last account signs out, as each account already clears its own notifications. - Set up the service's subscriptions in a single setupSubscriptions(). - Rename switchChanged(to:) to enableNotificationsChanged(to:) and pusherConfiguration(identifiers:) to pusherConfiguration(for:). - Build the service without hopping to the main actor, it already runs there. Notification service extension - Check the account's switch in NotificationHandler using the session's settings, and log an error when a push arrives for an account that's turned off. - Always show pushes that match no signed-in account and log an error, so a broken setup stays visible. Other - Store a pending inline reply in a PendingInlineReplyDetails struct. - Assign the chats tab badge with weakAssign. - Make PusherConfiguration Equatable so the pusher test checks it in one expectation. - Clarify the comment about notifications without a receiver. * Print instead of logging before the app hooks run in the NSE A push that matches no signed-in account goes back to printing, as MXLog shouldn't be used before the app hooks have run. The push is still shown so a broken setup stays visible.
178 lines
7.5 KiB
Swift
178 lines
7.5 KiB
Swift
//
|
|
// Copyright 2026 Element Creations Ltd.
|
|
//
|
|
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
|
|
// Please see LICENSE files in the repository root for full details.
|
|
//
|
|
|
|
import Combine
|
|
import MatrixRustSDK
|
|
import SwiftUI
|
|
import UserNotifications
|
|
|
|
/// Handles one account's notifications: its pusher, whether they're on, its unread count and which of its
|
|
/// delivered notifications to remove. The `NotificationManager` does the removing, through this service's actions.
|
|
final class NotificationService: NotificationServiceProtocol {
|
|
private let clientProxy: ClientProxyProtocol
|
|
private let userSettings: UserSettings
|
|
|
|
/// The APNs token, unknown until the app registers for remote notifications.
|
|
private var deviceToken: Data?
|
|
private var cancellables = Set<AnyCancellable>()
|
|
|
|
private let actionsSubject = PassthroughSubject<NotificationServiceAction, Never>()
|
|
var actionsPublisher: AnyPublisher<NotificationServiceAction, Never> {
|
|
actionsSubject.eraseToAnyPublisher()
|
|
}
|
|
|
|
private let badgeCountSubject: CurrentValueSubject<Int, Never>
|
|
var badgeCountPublisher: CurrentValuePublisher<Int, Never> {
|
|
badgeCountSubject.asCurrentValuePublisher()
|
|
}
|
|
|
|
var userID: String {
|
|
clientProxy.userID
|
|
}
|
|
|
|
var isEnabled: Bool {
|
|
userSettings.account.enableNotifications
|
|
}
|
|
|
|
init(clientProxy: ClientProxyProtocol, userSettings: UserSettings) {
|
|
self.clientProxy = clientProxy
|
|
self.userSettings = userSettings
|
|
badgeCountSubject = .init(Int(clientProxy.totalUnreadNotifications))
|
|
|
|
setupSubscriptions()
|
|
}
|
|
|
|
func register(deviceToken: Data) async {
|
|
self.deviceToken = deviceToken
|
|
// A failure is retried on the next launch, which registers the token again.
|
|
await updatePusher(isEnabled: isEnabled)
|
|
}
|
|
|
|
func requestAuthorization() {
|
|
actionsSubject.send(.requestAuthorization)
|
|
}
|
|
|
|
func removeDeliveredMessageNotifications(for roomID: String) {
|
|
actionsSubject.send(.removeDeliveredNotifications { $0.request.content.roomID == roomID })
|
|
}
|
|
|
|
func removeDeliveredNotificationsForFullyReadRooms(_ rooms: [RoomSummary]) {
|
|
let roomsToLastMessageDates = rooms
|
|
.filter { $0.hasUnreadMessages == false }
|
|
.reduce(into: [:]) { partialResult, roomSummary in
|
|
partialResult[roomSummary.id] = roomSummary.lastMessageDate
|
|
}
|
|
guard !roomsToLastMessageDates.isEmpty else { return }
|
|
|
|
actionsSubject.send(.removeDeliveredNotifications { notification in
|
|
guard let roomID = notification.request.content.roomID,
|
|
let lastMessageDate = roomsToLastMessageDates[roomID] else {
|
|
return false
|
|
}
|
|
|
|
// The delivery date is later than the event's so only use it for notifications without an event date.
|
|
let notificationDate = notification.request.content.eventDate ?? notification.date
|
|
// Truncated to seconds to match `RoomSummary.lastMessageDate`.
|
|
return notificationDate.timeIntervalSince1970.rounded(.down) <= lastMessageDate.timeIntervalSince1970
|
|
})
|
|
}
|
|
|
|
func tearDown() async {
|
|
await updatePusher(isEnabled: false)
|
|
actionsSubject.send(.removeDeliveredNotifications { _ in true })
|
|
}
|
|
|
|
// MARK: - Private
|
|
|
|
private func setupSubscriptions() {
|
|
let roomListPublisher = clientProxy.staticRoomSummaryProvider.roomListPublisher
|
|
|
|
Task { [weak self] in
|
|
for await roomSummaries in roomListPublisher.values {
|
|
guard let self else { return }
|
|
|
|
updateBadgeCount(Int(clientProxy.totalUnreadNotifications))
|
|
removeDeliveredNotificationsForFullyReadRooms(roomSummaries)
|
|
}
|
|
}
|
|
.store(in: &cancellables)
|
|
|
|
// The settings screen turns notifications on and off through `AccountSettings.enableNotifications`.
|
|
userSettings.account.enableNotificationsPublisher
|
|
.dropFirst()
|
|
.sink { [weak self] isEnabled in
|
|
self?.enableNotificationsChanged(to: isEnabled)
|
|
}
|
|
.store(in: &cancellables)
|
|
}
|
|
|
|
private func enableNotificationsChanged(to isEnabled: Bool) {
|
|
MXLog.info("Notifications turned \(isEnabled ? "on" : "off") for \(userID)")
|
|
// The extension drops pushes for an account turned off, so a pusher that fails to update is fixed on the next launch.
|
|
Task { await updatePusher(isEnabled: isEnabled) }
|
|
|
|
if isEnabled {
|
|
requestAuthorization()
|
|
}
|
|
}
|
|
|
|
private func updateBadgeCount(_ badgeCount: Int) {
|
|
guard badgeCount != badgeCountSubject.value else { return }
|
|
badgeCountSubject.send(badgeCount)
|
|
}
|
|
|
|
/// Sets the pusher when enabled and deletes it otherwise. Nothing to update until the device token is known.
|
|
private func updatePusher(isEnabled: Bool) async {
|
|
guard let deviceToken else { return }
|
|
|
|
let identifiers = PusherIdentifiers(pushkey: deviceToken.base64EncodedString(), appId: userSettings.app.pusherAppID)
|
|
do {
|
|
if isEnabled {
|
|
try await clientProxy.setPusher(with: pusherConfiguration(for: identifiers))
|
|
MXLog.info("Set pusher succeeded")
|
|
} else {
|
|
try await clientProxy.deletePusher(with: identifiers)
|
|
MXLog.info("Delete pusher succeeded")
|
|
}
|
|
} catch {
|
|
MXLog.error("Updating the pusher failed: \(error)")
|
|
}
|
|
}
|
|
|
|
private func pusherConfiguration(for identifiers: PusherIdentifiers) throws -> PusherConfiguration {
|
|
let defaultPayload = APNSPayload(aps: APSInfo(mutableContent: 1,
|
|
alert: APSAlert(locKey: "Notification",
|
|
locArgs: [])),
|
|
pusherNotificationClientIdentifier: clientProxy.pusherNotificationClientIdentifier)
|
|
|
|
return try PusherConfiguration(identifiers: identifiers,
|
|
kind: .http(data: .init(url: userSettings.app.pushGatewayNotifyEndpoint.absoluteString,
|
|
format: .eventIdOnly,
|
|
defaultPayload: defaultPayload.toJsonString())),
|
|
appDisplayName: "\(InfoPlistReader.main.bundleDisplayName) (iOS)",
|
|
deviceDisplayName: UIDevice.current.name,
|
|
profileTag: pusherProfileTag(),
|
|
lang: Bundle.app.preferredLocalizations.first ?? "en",
|
|
// Otherwise accounts on the same homeserver delete each other's pusher.
|
|
append: userSettings.app.multiAccountEnabled)
|
|
}
|
|
|
|
private func pusherProfileTag() -> String {
|
|
if let currentTag = userSettings.app.pusherProfileTag {
|
|
return currentTag
|
|
}
|
|
let chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
|
|
let newTag = (0..<16).map { _ in
|
|
let offset = Int.random(in: 0..<chars.count)
|
|
return String(chars[chars.index(chars.startIndex, offsetBy: offset)])
|
|
}.joined()
|
|
|
|
userSettings.app.pusherProfileTag = newTag
|
|
return newTag
|
|
}
|
|
}
|