Skip to content
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

Remove the voice broadcast chunks from the attachments list #7133

Merged
merged 2 commits into from
Dec 2, 2022
+9 −0
Merged

Remove the voice broadcast chunks from the attachments list #7133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2701d96
Remove the voice broadcast chunks from the attachments list
Dec 2, 2022
977d355
Add Towncrier file
Dec 2, 2022
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
5 changes: 5 additions & 0 deletions Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1373,6 +1373,11 @@ - (BOOL)shouldQueueEventForProcessing:(MXEvent*)event roomState:(MXRoomState*)ro
// ignore the event
return NO;
}

// Ignore voice message related to an actual voice broadcast.
if (event.content[VoiceBroadcastSettings.voiceBroadcastContentKeyChunkType] != nil) {
return NO;
}
}

// Check for undecryptable messages that were sent while the user was not in the room and hide them
Expand Down
1 change: 1 addition & 0 deletions RiotNSE/target.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,4 @@ targets:
excludes:
- "**/*.md" # excludes all files with the .md extension
- path: ../Riot/Modules/Room/TimelineCells/Styles/RoomTimelineStyleIdentifier.swift
- path: ../Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastSettings.swift
1 change: 1 addition & 0 deletions RiotShareExtension/target.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,4 @@ targets:
excludes:
- "**/*.md" # excludes all files with the .md extension
- path: ../Riot/Modules/Room/TimelineCells/Styles/RoomTimelineStyleIdentifier.swift
- path: ../Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastSettings.swift
1 change: 1 addition & 0 deletions SiriIntents/target.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,4 @@ targets:
excludes:
- "**/*.md" # excludes all files with the .md extension
- path: ../Riot/Modules/Room/TimelineCells/Styles/RoomTimelineStyleIdentifier.swift
- path: ../Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastSettings.swift
1 change: 1 addition & 0 deletions changelog.d/pr-7133.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Labs: VoiceBroadcast: Remove the voice broadcast chunks from the attachments list