felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-18 07:28:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/5292_refresh_tokens

Browse Source
This commit is contained in:
David Langley
2022-01-06 22:43:20 +00:00
parent 756b1c3d1d aaab7b8634
commit 72bcae9d15
312 changed files with 8682 additions and 2325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
RiotNSE/NotificationService.swift
View File

@@ -404,8 +404,8 @@ class NotificationService: UNNotificationServiceExtension {
}
}
let msgType = event.content["msgtype"] as? String
let messageContent = event.content["body"] as? String
let msgType = event.content[kMXMessageTypeKey] as? String
let messageContent = event.content[kMXMessageBodyKey] as? String
let isReply = event.isReply()
if isReply {
@@ -420,6 +420,11 @@ class NotificationService: UNNotificationServiceExtension {
break
}
if event.location != nil {
notificationBody = NSString.localizedUserNotificationString(forKey: "LOCATION_FROM_USER", arguments: [eventSenderName])
break
}
switch msgType {
case kMXMessageTypeEmote:
notificationBody = NSString.localizedUserNotificationString(forKey: "ACTION_FROM_USER", arguments: [eventSenderName, messageContent as Any])
@@ -519,6 +524,9 @@ class NotificationService: UNNotificationServiceExtension {
additionalUserInfo = [Constants.userInfoKeyPresentNotificationOnForeground: true]
}
}
case .pollStart:
notificationTitle = self.messageTitle(for: eventSenderName, in: roomDisplayName)
notificationBody = MXEventContentPollStart(fromJSON: event.content)?.question
default:
break
}