From e8064fa3d1e7ac80e706d2e8125a942d556ab1ff Mon Sep 17 00:00:00 2001
From: valere <valeref@matrix.org>
Date: Wed, 25 Jan 2023 16:30:11 +0100
Subject: [PATCH] fix error in merge

---
 .../session/room/relation/threads/FetchThreadTimelineTask.kt   | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt
index f129ce9034..b3322d3fae 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt
@@ -17,7 +17,6 @@ package org.matrix.android.sdk.internal.session.room.relation.threads
 
 import com.zhuinden.monarchy.Monarchy
 import io.realm.Realm
-import kotlinx.coroutines.runBlocking
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.crypto.CryptoService
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
@@ -136,9 +135,7 @@ internal class DefaultFetchThreadTimelineTask @Inject constructor(
             if (!isRootThreadTimelineEventEntityKnown) {
                 // Fetch the root event from the server
                 threadRootEvent = tryOrNull {
-                    runBlocking {
                         getEventTask.execute(GetEventTask.Params(roomId = params.roomId, eventId = params.rootThreadEventId))
-                    }
                 }
             }
         }