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

Prune the content of deleted events completely #5707

Merged
merged 2 commits into from
Apr 6, 2022
Merged

Prune the content of deleted events completely #5707

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
9d41508
Prune the content of deleted events completely
ariskotsomitopoulos Apr 6, 2022
1b9fd3b
Add changelog
ariskotsomitopoulos Apr 6, 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
1 change: 1 addition & 0 deletions changelog.d/5707.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Redacted events are no longer visible.
6 changes: 3 additions & 3 deletions ...c/main/java/org/matrix/android/sdk/internal/session/room/prune/RedactionEventProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ internal class RedactionEventProcessor @Inject constructor() : EventInsertLivePr
// }

val modified = unsignedData.copy(redactedEvent = redactionEvent)
// I Commented the line below, it should not be empty while we lose all the previous info about
// the redacted event
// eventToPrune.content = ContentMapper.map(emptyMap())
// Deleting the content of a thread message will result to delete the thread relation, however threads are now dynamic
// so there is not much of a problem
eventToPrune.content = ContentMapper.map(emptyMap())
eventToPrune.unsignedData = MoshiProvider.providesMoshi().adapter(UnsignedData::class.java).toJson(modified)
eventToPrune.decryptionResultJson = null
eventToPrune.decryptionErrorCode = null
Expand Down