Skip to content

Ignore the voice broadcast chunks at the notifications level #7230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yostyle merged 3 commits into from
Jan 10, 2023
Merged

Ignore the voice broadcast chunks at the notifications level #7230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b3eeaa
Remove voice broadcast chunk notifications
yostyle Jan 4, 2023
16c03c9
Add changelog
yostyle Jan 4, 2023
0ff9c94
Send a notification on first chunk.
yostyle Jan 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Riot/Assets/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@
/* Sticker from a specific person, not referencing a room. */
"STICKER_FROM_USER" = "%@ sent a sticker";

/* New voice broadcast from a specific person, not referencing a room. */
"VOICE_BROADCAST_FROM_USER" = "%@ started a voice broadcast";

/** Notification messages **/

/* New message indicator on unknown room */
Expand Down
9 changes: 8 additions & 1 deletion RiotNSE/NotificationService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,14 @@ class NotificationService: UNNotificationServiceExtension {
notificationBody = NotificationService.localizedString(forKey: "VIDEO_FROM_USER", eventSenderName)
case kMXMessageTypeAudio:
if event.isVoiceMessage() {
notificationBody = NotificationService.localizedString(forKey: "VOICE_MESSAGE_FROM_USER", eventSenderName)
// Ignore voice broadcast chunk event except the first one.
if let chunkInfo = event.content[VoiceBroadcastSettings.voiceBroadcastContentKeyChunkType] as? [String: UInt] {
if chunkInfo[VoiceBroadcastSettings.voiceBroadcastContentKeyChunkSequence] == 1 {
notificationBody = NotificationService.localizedString(forKey: "VOICE_BROADCAST_FROM_USER", eventSenderName)
}
} else {
notificationBody = NotificationService.localizedString(forKey: "VOICE_MESSAGE_FROM_USER", eventSenderName)
}
} else {
notificationBody = NotificationService.localizedString(forKey: "AUDIO_FROM_USER", eventSenderName, messageContent)
}
Expand Down
1 change: 1 addition & 0 deletions changelog.d/pr-7230.change
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Ignore the voice broadcast chunks at the notifications level