rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix / cold start

Browse Source
This commit is contained in:
Valere 2020-02-02 14:01:45 +01:00
parent 5fb4f274f9
commit 367057cc29
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
View File

@ -57,7 +57,6 @@ internal class MXMegolmDecryption(private val userId: String,
var newSessionListener: NewSessionListener? = null var newSessionListener: NewSessionListener? = null
var hasCheckUserCrossSigning = false
/** /**
* Events which we couldn't decrypt due to unknown sessions / indexes: map from * Events which we couldn't decrypt due to unknown sessions / indexes: map from
* senderKey|sessionId to timelines to list of MatrixEvents. * senderKey|sessionId to timelines to list of MatrixEvents.
@ -67,17 +66,7 @@ internal class MXMegolmDecryption(private val userId: String,
override suspend fun decryptEvent(event: Event, timeline: String): MXEventDecryptionResult { override suspend fun decryptEvent(event: Event, timeline: String): MXEventDecryptionResult {
// If cross signing is enabled, we don't send request until the keys are trusted // If cross signing is enabled, we don't send request until the keys are trusted
// There could be a race effect here when xsigning is enabled, we should ensure that keys was downloaded once // There could be a race effect here when xsigning is enabled, we should ensure that keys was downloaded once
if (!hasCheckUserCrossSigning) { val requestOnFail = cryptoStore.getMyCrossSigningInfo()?.isTrusted() == true
deviceListManager.downloadKeys(listOf(userId), true)
hasCheckUserCrossSigning = true
}
val requestOnFail =
if (cryptoStore.getMyCrossSigningInfo() != null) {
cryptoStore.getMyCrossSigningInfo()?.isTrusted() == true
} else {
// Legacy
true
}
return decryptEvent(event, timeline, requestOnFail) return decryptEvent(event, timeline, requestOnFail)
} }