mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2025-02-17 20:40:07 +03:00
fix error in merge
This commit is contained in:
parent
8b50fa3828
commit
e8064fa3d1
1 changed files with 0 additions and 3 deletions
|
@ -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,12 +135,10 @@ 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))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
monarchy.awaitTransaction { realm ->
|
||||
val threadChunk = ChunkEntity.findLastForwardChunkOfThread(realm, params.roomId, params.rootThreadEventId)
|
||||
|
|
Loading…
Add table
Reference in a new issue