Open the room live when tapping the notification for its newest message

Tapping a message notification always opened the room on a timeline
focussed on that event, even when it was the newest message and the
live timeline already ends with it.

On tap, the notification manager now checks whether any other delivered
notification for the same room is more recent. If none is, the room is
opened live instead of focussed. Older notifications in a room keep
focussing on their event.
This commit is contained in:
Stefan Ceriu
2026-09-30 13:07:01 +03:00
parent 7973da8251
commit 4c71cae0f5
6 changed files with 50 additions and 14 deletions
@@ -21,6 +21,7 @@ final class NotificationManagerTests {
private var shouldDisplayInAppNotificationReturnValue = false
private var handleInlineReplyDelegateCalled = false
private var notificationTappedDelegateCalled = false
private var notificationTappedIsNewestInRoom: Bool?
private var registerForRemoteNotificationsDelegateCalled: (() -> Void)?
private let appSettings: AppSettings
@@ -238,6 +239,31 @@ final class NotificationManagerTests {
#expect(notificationTappedDelegateCalled)
}
@Test
func whenTappedNotificationIsTheNewestInItsRoom_delegateIsToldItIsNewest() async throws {
notificationManager.delegate = self
let date = Date.now
notificationCenter.deliveredNotificationsReturnValue = try [UNNotification.with(userInfo: [NotificationConstants.UserInfoKey.roomIdentifier: "!room:matrix.org"], date: date - 60),
UNNotification.with(userInfo: [NotificationConstants.UserInfoKey.roomIdentifier: "!other:matrix.org"], date: date + 60)]
let response = try UNTextInputNotificationResponse.with(userInfo: [NotificationConstants.UserInfoKey.roomIdentifier: "!room:matrix.org"], date: date)
await notificationManager.userNotificationCenter(UNUserNotificationCenter.current(), didReceive: response)
#expect(notificationTappedIsNewestInRoom == true)
}
@Test
func whenTappedNotificationIsOlderThanAnotherInItsRoom_delegateIsToldItIsNotNewest() async throws {
notificationManager.delegate = self
let date = Date.now
notificationCenter.deliveredNotificationsReturnValue = try [UNNotification.with(userInfo: [NotificationConstants.UserInfoKey.roomIdentifier: "!room:matrix.org"], date: date + 60)]
let response = try UNTextInputNotificationResponse.with(userInfo: [NotificationConstants.UserInfoKey.roomIdentifier: "!room:matrix.org"], date: date)
await notificationManager.userNotificationCenter(UNUserNotificationCenter.current(), didReceive: response)
#expect(notificationTappedIsNewestInRoom == false)
}
@Test
func updatingAppBadgeCountUsesTheClientSideCount() async {
clientProxy.totalUnreadNotifications = 7
@@ -272,8 +298,9 @@ extension NotificationManagerTests: @MainActor NotificationManagerDelegate {
shouldDisplayInAppNotificationReturnValue
}
func notificationTapped(content: UNNotificationContent) async {
func notificationTapped(content: UNNotificationContent, isNewestInRoom: Bool) async {
notificationTappedDelegateCalled = true
notificationTappedIsNewestInRoom = isNewestInRoom
}
func handleInlineReply(_ service: ElementX.NotificationManagerProtocol, content: UNNotificationContent, replyText: String) async {
@@ -11,7 +11,7 @@ import UserNotifications
import XCTest
extension UNNotification {
static func with(userInfo: [AnyHashable: Any]) throws -> UNNotification {
static func with(userInfo: [AnyHashable: Any], date: Date? = nil) throws -> UNNotification {
let content = UNMutableNotificationContent()
content.userInfo = userInfo
let request = UNNotificationRequest(identifier: "",
@@ -20,6 +20,9 @@ extension UNNotification {
let archiver = MockCoder(requiringSecureCoding: false)
let notification = try XCTUnwrap(UNNotification(coder: archiver))
notification.setValue(request, forKey: "request")
if let date {
notification.setValue(date, forKey: "date")
}
return notification
}
}
@@ -10,15 +10,9 @@ import UserNotifications
import XCTest
extension UNTextInputNotificationResponse {
static func with(userInfo: [AnyHashable: Any], actionIdentifier: String = UNNotificationDefaultActionIdentifier) throws -> UNNotificationResponse {
let content = UNMutableNotificationContent()
content.userInfo = userInfo
let request = UNNotificationRequest(identifier: "",
content: content,
trigger: nil)
static func with(userInfo: [AnyHashable: Any], date: Date? = nil, actionIdentifier: String = UNNotificationDefaultActionIdentifier) throws -> UNNotificationResponse {
let notification = try UNNotification.with(userInfo: userInfo, date: date)
let archiver = MockCoder(requiringSecureCoding: false)
let notification = try XCTUnwrap(UNNotification(coder: archiver))
notification.setValue(request, forKey: "request")
let response = try XCTUnwrap(UNTextInputNotificationResponse(coder: archiver))
response.setValue(notification, forKey: "notification")