ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 16:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clarify the mention copy in notifications. (#3142)

Browse Source
This commit is contained in:
Doug
2024-08-22 12:51:05 +01:00
committed by GitHub
parent 304070e8cc
commit a1cb6bd376
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NSE/Sources/NotificationContentBuilder.swift
+7 -4
View File
@@ -103,9 +103,7 @@ struct NotificationContentBuilder {
var notification = try await processCommonRoomMessage(notificationItem: notificationItem, mediaProvider: mediaProvider) var notification = try await processCommonRoomMessage(notificationItem: notificationItem, mediaProvider: mediaProvider)
let displayName = notificationItem.senderDisplayName ?? notificationItem.roomDisplayName let displayName = notificationItem.senderDisplayName ?? notificationItem.roomDisplayName
let message = String(messageEventStringBuilder.buildAttributedString(for: messageType, senderDisplayName: displayName).characters) notification.body = String(messageEventStringBuilder.buildAttributedString(for: messageType, senderDisplayName: displayName).characters)
notification.body = notificationItem.hasMention ? L10n.notificationMentionedYouBody(message) : message
switch messageType { switch messageType {
case .image(content: let content): case .image(content: let content):
@@ -153,9 +151,14 @@ struct NotificationContentBuilder {
} }
notification.categoryIdentifier = NotificationConstants.Category.message notification.categoryIdentifier = NotificationConstants.Category.message
let senderName = if let displayName = notificationItem.senderDisplayName {
notificationItem.hasMention ? L10n.notificationSenderMentionReply(displayName) : displayName
} else {
notificationItem.roomDisplayName
}
notification = try await notification.addSenderIcon(using: mediaProvider, notification = try await notification.addSenderIcon(using: mediaProvider,
senderID: notificationItem.senderID, senderID: notificationItem.senderID,
senderName: notificationItem.senderDisplayName ?? notificationItem.roomDisplayName, senderName: senderName,
icon: icon(for: notificationItem)) icon: icon(for: notificationItem))
return notification return notification
} }