filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #1191

This commit is contained in:
Valere 2020-03-31 17:08:11 +02:00
parent a40dd31543
commit 8ecdac7c31
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/RoomVerificationUpdateTask.kt
View File

@ -75,7 +75,7 @@ internal class DefaultRoomVerificationUpdateTask @Inject constructor(
// TODO use a global event decryptor? attache to session and that listen to new sessionId? // TODO use a global event decryptor? attache to session and that listen to new sessionId?
// for now decrypt sync // for now decrypt sync
try { try {
val result = cryptoService.decryptEvent(event, event.roomId + UUID.randomUUID().toString()) val result = cryptoService.decryptEvent(event, "")
event.mxDecryptionResult = OlmDecryptionResult( event.mxDecryptionResult = OlmDecryptionResult(
payload = result.clearEvent, payload = result.clearEvent,
senderKey = result.senderCurve25519Key, senderKey = result.senderCurve25519Key,

2
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/EventRelationsAggregationTask.kt
View File

@ -230,7 +230,7 @@ internal class DefaultEventRelationsAggregationTask @Inject constructor(
private fun decryptIfNeeded(event: Event) { private fun decryptIfNeeded(event: Event) {
if (event.mxDecryptionResult == null) { if (event.mxDecryptionResult == null) {
try { try {
val result = cryptoService.decryptEvent(event, event.roomId ?: "") val result = cryptoService.decryptEvent(event, "")
event.mxDecryptionResult = OlmDecryptionResult( event.mxDecryptionResult = OlmDecryptionResult(
payload = result.clearEvent, payload = result.clearEvent,
senderKey = result.senderCurve25519Key, senderKey = result.senderCurve25519Key,

2
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
View File

@ -71,7 +71,7 @@ class VerificationItemFactory @Inject constructor(
?: return ignoredConclusion(event, highlight, callback) ?: return ignoredConclusion(event, highlight, callback)
// If it's not a request ignore this event // If it's not a request ignore this event
if (refEvent.root.getClearContent().toModel<MessageVerificationRequestContent>() == null) return ignoredConclusion(event, highlight, callback) // if (refEvent.root.getClearContent().toModel<MessageVerificationRequestContent>() == null) return ignoredConclusion(event, highlight, callback)
val referenceInformationData = messageInformationDataFactory.create(refEvent, null) val referenceInformationData = messageInformationDataFactory.create(refEvent, null)