From cdb1b8d8f86b938daba538e364c57fabfaaa3999 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 3 Jun 2020 10:38:30 +0200
Subject: [PATCH] post merge fix

---
 .../vector/matrix/android/internal/session/SessionModule.kt  | 5 ++---
 .../matrix/android/internal/session/sync/RoomSyncHandler.kt  | 2 +-
 .../room/detail/timeline/factory/MergedHeaderItemFactory.kt  | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt
index ff668bbc06..c54e6e06e7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt
@@ -59,7 +59,6 @@ import im.vector.matrix.android.internal.network.NetworkCallbackStrategy
 import im.vector.matrix.android.internal.network.NetworkConnectivityChecker
 import im.vector.matrix.android.internal.network.PreferredNetworkCallbackStrategy
 import im.vector.matrix.android.internal.network.RetrofitFactory
-import im.vector.matrix.android.internal.network.httpclient.addAccessTokenInterceptor
 import im.vector.matrix.android.internal.network.interceptors.CurlLoggingInterceptor
 import im.vector.matrix.android.internal.network.token.AccessTokenProvider
 import im.vector.matrix.android.internal.network.token.HomeserverAccessTokenProvider
@@ -185,7 +184,7 @@ internal abstract class SessionModule {
         @SessionScope
         @Authenticated
         fun providesOkHttpClient(@Unauthenticated okHttpClient: OkHttpClient,
-                                 accessTokenInterceptor: AccessTokenInterceptor,
+                                 @Authenticated accessTokenProvider: AccessTokenProvider,
                                  @SessionId sessionId: String,
                                  @MockHttpInterceptor testInterceptor: TestInterceptor?): OkHttpClient {
             return okHttpClient.newBuilder()
@@ -194,7 +193,7 @@ internal abstract class SessionModule {
                         val existingCurlInterceptors = interceptors().filterIsInstance<CurlLoggingInterceptor>()
                         interceptors().removeAll(existingCurlInterceptors)
 
-                        addInterceptor(accessTokenInterceptor)
+                        addInterceptor(AccessTokenInterceptor(accessTokenProvider))
                         if (testInterceptor != null) {
                             testInterceptor.sessionId = sessionId
                             addInterceptor(testInterceptor)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomSyncHandler.kt
index 3be357920c..b1d8d7b0b5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomSyncHandler.kt
@@ -265,7 +265,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                                      isLimited: Boolean = true,
                                      syncLocalTimestampMillis: Long,
                                      isInitialSync: Boolean): ChunkEntity {
-        val lastChunk = ChunkEntity.findLastLiveChunkFromRoom(realm, roomEntity.roomId)
+        val lastChunk = ChunkEntity.findLastForwardChunkOfRoom(realm, roomEntity.roomId)
         val chunkEntity = if (!isLimited && lastChunk != null) {
             lastChunk
         } else {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
index e82531cef7..c1b1188ba1 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
@@ -177,8 +177,8 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
                     if (!highlighted && mergedEvent.root.eventId == eventIdToHighlight) {
                         highlighted = true
                     }
-                    val senderAvatar = mergedEvent.senderAvatar
-                    val senderName = mergedEvent.getDisambiguatedDisplayName()
+                    val senderAvatar = mergedEvent.senderInfo.avatarUrl
+                    val senderName = mergedEvent.senderInfo.disambiguatedDisplayName
                     val data = BasedMergedItem.Data(
                             userId = mergedEvent.root.senderId ?: "",
                             avatarUrl = senderAvatar,