Skip to content

Commit

Permalink
Crypto: Do not decrypt synchronously. It asynchronously happens upstr…
Browse files Browse the repository at this point in the history
…eam now

#4306)
  • Loading branch information
manuroe committed May 19, 2021
1 parent 1cb2c94 commit ff41ce8
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
2 changes: 1 addition & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Changes to be released in next version
*

🙌 Improvements
*
* Crypto: Do not decrypt synchronously. It asynchronously happens upstream now (#4306).

🐛 Bugfix
* buildRelease.sh: Make bundler operations in the cloned repository folder.
Expand Down
6 changes: 0 additions & 6 deletions Riot/Modules/Room/EditHistory/EditHistoryViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -220,12 +220,6 @@ final class EditHistoryViewModel: EditHistoryViewModelType {
}

private func process(event: MXEvent, ts: UInt64) -> EditHistoryMessage? {

if event.isEncrypted && event.clear == nil {
if self.session.decryptEvent(event, inTimeline: nil) == false {
print("[EditHistoryViewModel] processEditEvent: Fail to decrypt event: \(event.eventId ?? "")")
}
}

let formatterError = UnsafeMutablePointer<MXKEventFormatterError>.allocate(capacity: 1)
guard let message = self.formatter.attributedString(from: event, with: nil, error: formatterError) else {
Expand Down

0 comments on commit ff41ce8

Please sign in to comment.