diff --git a/CHANGES.md b/CHANGES.md index 3ec29d8fc3..4100031b36 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,8 @@ +Changes in RiotX 0.14.2 (2020-02-02) +=================================================== + +Fix RiotX not starting issue + Changes in RiotX 0.14.1 (2020-02-02) =================================================== diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt index 5519e5b7ac..9121ce3fcb 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt @@ -57,7 +57,6 @@ internal class MXMegolmDecryption(private val userId: String, var newSessionListener: NewSessionListener? = null - var hasCheckUserCrossSigning = false /** * Events which we couldn't decrypt due to unknown sessions / indexes: map from * 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 { // 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 - if (!hasCheckUserCrossSigning) { - deviceListManager.downloadKeys(listOf(userId), true) - hasCheckUserCrossSigning = true - } - val requestOnFail = - if (cryptoStore.getMyCrossSigningInfo() != null) { - cryptoStore.getMyCrossSigningInfo()?.isTrusted() == true - } else { - // Legacy - true - } + val requestOnFail = cryptoStore.getMyCrossSigningInfo()?.isTrusted() == true return decryptEvent(event, timeline, requestOnFail) } diff --git a/vector/build.gradle b/vector/build.gradle index 724456eb14..0407874ad0 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -15,8 +15,8 @@ androidExtensions { } ext.versionMajor = 0 -ext.versionMinor = 14 -ext.versionPatch = 1 +ext.versionMinor = 15 +ext.versionPatch = 0 static def getGitTimestamp() { def cmd = 'git show -s --format=%ct'