From 93208eb0d9b9e2d3bfdbb4de26be88e44f6f5374 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Wed, 22 Jun 2022 12:39:43 +0200
Subject: [PATCH] Revert "Bring back downstream "Update room previews once we
 have decryption keys""

This reverts commit 0393dd51c9edcc2139c372755f490d11c50a2af3.

Change-Id: If0bf358a1cf7908e5c46dc598b7a42aa667fe644
---
 .../actions/MegolmSessionDataImporter.kt      | 20 -------------------
 .../app/features/home/HomeDetailViewModel.kt  |  3 +--
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt
index 85bff26e61..67d73c21ed 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt
@@ -17,9 +17,6 @@
 package org.matrix.android.sdk.internal.crypto.actions
 
 import androidx.annotation.WorkerThread
-import com.zhuinden.monarchy.Monarchy
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.listeners.ProgressListener
 import org.matrix.android.sdk.api.logger.LoggerTag
@@ -30,11 +27,6 @@ import org.matrix.android.sdk.internal.crypto.OutgoingKeyRequestManager
 import org.matrix.android.sdk.internal.crypto.RoomDecryptorProvider
 import org.matrix.android.sdk.internal.crypto.algorithms.megolm.MXMegolmDecryption
 import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
-import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
-import org.matrix.android.sdk.internal.database.query.where
-import org.matrix.android.sdk.internal.di.SessionDatabase
-import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryUpdater
-import org.matrix.android.sdk.internal.util.awaitTransaction
 import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 import javax.inject.Inject
@@ -43,9 +35,6 @@ private val loggerTag = LoggerTag("MegolmSessionDataImporter", LoggerTag.CRYPTO)
 
 internal class MegolmSessionDataImporter @Inject constructor(private val olmDevice: MXOlmDevice,
                                                              private val roomDecryptorProvider: RoomDecryptorProvider,
-                                                             @SessionDatabase private val monarchy: Monarchy,
-                                                             private val roomSummaryUpdater: RoomSummaryUpdater,
-                                                             private val cryptoCoroutineScope: CoroutineScope,
                                                              private val outgoingKeyRequestManager: OutgoingKeyRequestManager,
                                                              private val cryptoStore: IMXCryptoStore,
                                                              private val clock: Clock,
@@ -128,15 +117,6 @@ internal class MegolmSessionDataImporter @Inject constructor(private val olmDevi
 
         Timber.tag(loggerTag.value).v("## importMegolmSessionsData : sessions import " + (t1 - t0) + " ms (" + megolmSessionsData.size + " sessions)")
 
-        // SC: Retry decrypting room previews for the room list
-        cryptoCoroutineScope.launch {
-            monarchy.awaitTransaction { realm ->
-                RoomSummaryEntity.where(realm).findAll().forEach { entity ->
-                    roomSummaryUpdater.refreshLatestPreviewContent(realm, entity.roomId)
-                }
-            }
-        }
-
         return ImportRoomKeysResult(totalNumbersOfKeys, totalNumbersOfImportedKeys)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index b97da05985..ffa22233e7 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -100,8 +100,7 @@ class HomeDetailViewModel @AssistedInject constructor(
 
     private val refreshRoomSummariesOnCryptoSessionChange = object : NewSessionListener {
         override fun onNewSession(roomId: String?, senderKey: String, sessionId: String) {
-            // SC: we're doing this directly in MegolmSessionDataImporter
-            //session.roomService().refreshJoinedRoomSummaryPreviews(roomId)
+            session.roomService().refreshJoinedRoomSummaryPreviews(roomId)
         }
     }