diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m index d315f7afc6..3db6c92903 100644 --- a/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m +++ b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m @@ -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 diff --git a/RiotNSE/target.yml b/RiotNSE/target.yml index 22b415154f..c7578dffe4 100644 --- a/RiotNSE/target.yml +++ b/RiotNSE/target.yml @@ -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 diff --git a/RiotShareExtension/target.yml b/RiotShareExtension/target.yml index a44714f335..666a6e80a7 100644 --- a/RiotShareExtension/target.yml +++ b/RiotShareExtension/target.yml @@ -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 diff --git a/SiriIntents/target.yml b/SiriIntents/target.yml index d20501785d..8bb8034f5b 100644 --- a/SiriIntents/target.yml +++ b/SiriIntents/target.yml @@ -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 diff --git a/changelog.d/pr-7133.bugfix b/changelog.d/pr-7133.bugfix new file mode 100644 index 0000000000..b05e8b0c48 --- /dev/null +++ b/changelog.d/pr-7133.bugfix @@ -0,0 +1 @@ +Labs: VoiceBroadcast: Remove the voice broadcast chunks from the attachments list