Merge branch 'release/tchap_v2.9.5'

TCHAP_CHANGES.md

@@ -1,3 +1,11 @@
+Changes in Tchap 2.9.5 (2023-10-06)
+===================================
+
+Bugfixes 🐛
+----------
+ - Correction des messages chiffrés quand il existe qu'une seule session ([#979](https://github.com/tchapgouv/tchap-android/issues/979))
+
+
 Changes in Tchap 2.9.4 (2023-10-06)
 ===================================
 

matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCryptoService.kt

@@ -54,6 +54,7 @@ import org.matrix.android.sdk.api.session.crypto.model.MXUsersDevicesMap
 import org.matrix.android.sdk.api.session.events.model.Content
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.content.EncryptedEventContent
 import org.matrix.android.sdk.api.session.events.model.content.EncryptionEventContent
 import org.matrix.android.sdk.api.session.events.model.content.RoomKeyContent
 import org.matrix.android.sdk.api.session.events.model.content.RoomKeyWithHeldContent
@@ -133,6 +134,7 @@ internal class RustCryptoService @Inject constructor(
  private val getRoomUserIds: GetRoomUserIdsUseCase,
  private val outgoingRequestsProcessor: OutgoingRequestsProcessor,
  private val matrixConfiguration: MatrixConfiguration,
+ private val rateLimiter: PerSessionBackupQueryRateLimiter,
 ) : CryptoService {
 
  private val isStarting = AtomicBoolean(false)
@@ -493,7 +495,30 @@ internal class RustCryptoService @Inject constructor(
  */
  @Throws(MXCryptoError::class)
  override suspend fun decryptEvent(event: Event, timeline: String): MXEventDecryptionResult {
- return olmMachine.decryptRoomEvent(event)
+ return try {
+ olmMachine.decryptRoomEvent(event)
+ } catch (mxCryptoError: MXCryptoError) {
+ // Tchap: try to perform a lazy migration from legacy store if there is no other session.
+ if (mxCryptoError is MXCryptoError.Base && mxCryptoError.errorType == MXCryptoError.ErrorType.UNKNOWN_INBOUND_SESSION_ID) {
+ Timber.v("Try to perform a lazy migration from legacy store")
+ /**
+ * It's a bit hacky, check how this can be better integrated with rust?
+ */
+ val content = event.content?.toModel<EncryptedEventContent>() ?: throw mxCryptoError
+ val roomId = event.roomId
+ val sessionId = content.sessionId
+ val senderKey = content.senderKey
+ if (roomId != null && sessionId != null) {
+ val legacy = tryOrNull("Failed to access legacy crypto store") {
+ cryptoStore.getInboundGroupSession(sessionId, senderKey.orEmpty())
+ }
+ if (legacy == null || olmMachine.importRoomKey(legacy).isFailure) {
+ rateLimiter.tryFromBackupIfPossible(sessionId, roomId)
+ }
+ }
+ }
+ throw mxCryptoError
+ }
  }
 
  /**

towncrier.toml

@@ -1,5 +1,5 @@
 [tool.towncrier]
- version = "2.9.4"
+ version = "2.9.5"
  directory = "changelog.d"
  filename = "TCHAP_CHANGES.md"
  name = "Changes in Tchap"

vector-app/build.gradle

@@ -37,7 +37,7 @@ ext.versionMinor = 9
 // Note: even values are reserved for regular release, odd values for hotfix release.
 // When creating a hotfix, you should decrease the value, since the current value
 // is the value for the next regular release.
-ext.versionPatch = 4
+ext.versionPatch = 5
 
 static def getGitTimestamp() {
  def cmd = 'git show -s --format=%ct'