From 9ced2048d2e2fe63e8526d7ed4dea5f729506da7 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Sun, 2 Feb 2020 14:26:09 +0100 Subject: [PATCH 1/3] Version++ --- CHANGES.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 4100031b36..d291712305 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,24 @@ +Changes in RiotX 0.15.0 (2020-XX-XX) +=================================================== + +Features ✨: + - + +Improvements 🙌: + - + +Other changes: + - + +Bugfix 🐛: + - + +Translations 🗣: + - + +Build 🧱: + - + Changes in RiotX 0.14.2 (2020-02-02) =================================================== From b182a63ea1255df375aa88b3f8c8df087a0090df Mon Sep 17 00:00:00 2001 From: Valere Date: Sun, 2 Feb 2020 15:28:00 +0100 Subject: [PATCH 2/3] fix concurrent co mofification --- .../android/internal/crypto/DeviceListManager.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DeviceListManager.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DeviceListManager.kt index bc5add34a1..87b2093e2d 100755 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DeviceListManager.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DeviceListManager.kt @@ -319,10 +319,11 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM for (userId in filteredUsers) { // al devices = val models = response.deviceKeys?.get(userId)?.mapValues { entry -> CryptoInfoMapper.map(entry.value) } - ?.toMutableMap() + Timber.v("## doKeyDownloadForUsers() : Got keys for $userId : $models") if (!models.isNullOrEmpty()) { + val workingCopy = models.toMutableMap() for ((deviceId, deviceInfo) in models) { // Get the potential previously store device keys for this device val previouslyStoredDeviceKeys = cryptoStore.getUserDevice(userId, deviceId) @@ -335,21 +336,21 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM // Validate received keys if (!validateDeviceKeys(deviceInfo, userId, deviceId, previouslyStoredDeviceKeys)) { // New device keys are not valid. Do not store them - models.remove(deviceId) + workingCopy.remove(deviceId) if (null != previouslyStoredDeviceKeys) { // But keep old validated ones if any - models[deviceId] = previouslyStoredDeviceKeys + workingCopy[deviceId] = previouslyStoredDeviceKeys } } else if (null != previouslyStoredDeviceKeys) { // The verified status is not sync'ed with hs. // This is a client side information, valid only for this client. // So, transfer its previous value - models[deviceId]!!.trustLevel = previouslyStoredDeviceKeys.trustLevel + workingCopy[deviceId]!!.trustLevel = previouslyStoredDeviceKeys.trustLevel } } // Update the store // Note that devices which aren't in the response will be removed from the stores - cryptoStore.storeUserDevices(userId, models) + cryptoStore.storeUserDevices(userId, workingCopy) } // Handle cross signing keys update From 0049af7980e02e313e21b8f8321fc19bd364bed7 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 3 Feb 2020 16:15:38 +0100 Subject: [PATCH 3/3] Prepare version 0.14.3 --- CHANGES.md | 22 ++++------------------ vector/build.gradle | 4 ++-- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index d291712305..e922bec768 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,28 +1,14 @@ -Changes in RiotX 0.15.0 (2020-XX-XX) +Changes in RiotX 0.14.3 (2020-02-03) =================================================== -Features ✨: - - - -Improvements 🙌: - - - -Other changes: - - - Bugfix 🐛: - - - -Translations 🗣: - - - -Build 🧱: - - + - Fix Exception in DeviceListManager Changes in RiotX 0.14.2 (2020-02-02) =================================================== -Fix RiotX not starting issue +Bugfix 🐛: + - Fix RiotX not starting issue Changes in RiotX 0.14.1 (2020-02-02) =================================================== diff --git a/vector/build.gradle b/vector/build.gradle index 0407874ad0..96744ec224 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -15,8 +15,8 @@ androidExtensions { } ext.versionMajor = 0 -ext.versionMinor = 15 -ext.versionPatch = 0 +ext.versionMinor = 14 +ext.versionPatch = 3 static def getGitTimestamp() { def cmd = 'git show -s --format=%ct'