mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-10-23 19:26:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Simplify code

Browse source
This commit is contained in:
Benoit Marty 2021-03-02 10:54:37 +01:00
parent d2b39e5cb8
commit 7c0acc8ccf
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
View file

@ -83,26 +83,24 @@ class ViewEditHistoryViewModel @AssistedInject constructor(@Assisted
val events = data.map { event -> val events = data.map { event ->
val timelineID = event.roomId + UUID.randomUUID().toString() val timelineID = event.roomId + UUID.randomUUID().toString()
event.also { // We need to check encryption
// We need to check encryption if (event.isEncrypted() && event.mxDecryptionResult == null) {
if (it.isEncrypted() && it.mxDecryptionResult == null) { // for now decrypt sync
// for now decrypt sync try {
try { val result = session.cryptoService().decryptEvent(event, timelineID)
val result = session.cryptoService().decryptEvent(it, timelineID) event.mxDecryptionResult = OlmDecryptionResult(
it.mxDecryptionResult = OlmDecryptionResult( payload = result.clearEvent,
payload = result.clearEvent, senderKey = result.senderCurve25519Key,
senderKey = result.senderCurve25519Key, keysClaimed = result.claimedEd25519Key?.let { k -> mapOf("ed25519" to k) },
keysClaimed = result.claimedEd25519Key?.let { k -> mapOf("ed25519" to k) }, forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain
forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain )
) } catch (e: MXCryptoError) {
} catch (e: MXCryptoError) { Timber.w("Failed to decrypt event in history")
Timber.w("Failed to decrypt event in history")
}
} }
}
if (event.eventId == it.eventId) { if (event.eventId == event.eventId) {
originalIsReply = it.isReply() originalIsReply = event.isReply()
}
} }
} }
setState { setState {