From 8c26592d462f44f2169da649fab6e78e3bff0f46 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 12 May 2022 12:46:33 +0200
Subject: [PATCH] cleaning

---
 .../internal/crypto/keysbackup/DefaultKeysBackupService.kt   | 2 +-
 .../internal/crypto/store/db/migration/MigrateCryptoTo017.kt | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
index 04f33d1778..08765f0c39 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
@@ -1412,7 +1412,7 @@ internal class DefaultKeysBackupService @Inject constructor(
         olmInboundGroupSessionWrapper.safeSessionId ?: return null
         olmInboundGroupSessionWrapper.senderKey ?: return null
         // Gather information for each key
-        val device = olmInboundGroupSessionWrapper.senderKey?.let { cryptoStore.deviceWithIdentityKey(it) }
+        val device = cryptoStore.deviceWithIdentityKey(olmInboundGroupSessionWrapper.senderKey)
 
         // Build the m.megolm_backup.v1.curve25519-aes-sha2 data as defined at
         // https://github.com/uhoreg/matrix-doc/blob/e2e_backup/proposals/1219-storing-megolm-keys-serverside.md#mmegolm_backupv1curve25519-aes-sha2-key-format
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo017.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo017.kt
index b2a2129853..2e847ab28e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo017.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo017.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.crypto.store.db.migration
 import io.realm.DynamicRealm
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.internal.crypto.model.InboundGroupSessionData
-import org.matrix.android.sdk.internal.crypto.model.OlmInboundGroupSessionWrapper2
 import org.matrix.android.sdk.internal.crypto.store.db.deserializeFromRealm
 import org.matrix.android.sdk.internal.crypto.store.db.model.CryptoRoomEntityFields
 import org.matrix.android.sdk.internal.crypto.store.db.model.OlmInboundGroupSessionEntityFields
@@ -31,7 +30,7 @@ import timber.log.Timber
 /**
  * Version 17L enhance OlmInboundGroupSessionEntity to support shared history for MSC3061
  * Also migrates how megolm session are stored to avoid additional serialized frozen class
-*/
+ */
 internal class MigrateCryptoTo017(realm: DynamicRealm) : RealmMigrator(realm, 17) {
 
     override fun doMigrate(realm: DynamicRealm) {
@@ -52,7 +51,7 @@ internal class MigrateCryptoTo017(realm: DynamicRealm) : RealmMigrator(realm, 17
                         dynamicObject.getString(OlmInboundGroupSessionEntityFields.OLM_INBOUND_GROUP_SESSION_DATA)?.let { oldData ->
                             val oldWrapper = tryOrNull("Failed to convert megolm inbound group data") {
                                 @Suppress("DEPRECATION")
-                                deserializeFromRealm<OlmInboundGroupSessionWrapper2?>(oldData)
+                                deserializeFromRealm<org.matrix.android.sdk.internal.crypto.model.OlmInboundGroupSessionWrapper2?>(oldData)
                             }
                             val groupSession = oldWrapper?.olmInboundGroupSession
                                     ?: return@transform Unit.also {