From 987ca6dec4ac6a3df4b64b6ee16a9bdc2c359fb3 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Fri, 16 Dec 2022 10:15:50 +0100 Subject: [PATCH] Revert "stop listening timeline collection changes when app is not resumed (#7734)" This makes the chat view get destroyed onPause, leading to jump-to-bottom when clicking links, opening threads etc. This reverts commit cf59c80100d7a4b9ec02f62a43a6350e88fe2e0a. Change-Id: I56ae7027d0488013251bc88edd0e47a19dead315 --- .../vector/app/features/home/room/detail/TimelineFragment.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt index 15b0df6994..8f95598d9e 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt @@ -1159,7 +1159,6 @@ class TimelineFragment : notificationDrawerManager.setCurrentThread(timelineArgs.threadTimelineArgs?.rootThreadEventId) roomDetailPendingActionStore.data?.let { handlePendingAction(it) } roomDetailPendingActionStore.data = null - views.timelineRecyclerView.adapter = timelineEventController.adapter } private fun handlePendingAction(roomDetailPendingAction: RoomDetailPendingAction) { @@ -1178,7 +1177,6 @@ class TimelineFragment : super.onPause() notificationDrawerManager.setCurrentRoom(null) notificationDrawerManager.setCurrentThread(null) - views.timelineRecyclerView.adapter = null } private val emojiActivityResultLauncher = registerStartForActivityResult { activityResult -> @@ -1317,6 +1315,7 @@ class TimelineFragment : it.dispatchTo(scrollOnHighlightedEventCallback) } timelineEventController.addModelBuildListener(modelBuildListener) + views.timelineRecyclerView.adapter = timelineEventController.adapter views.timelineRecyclerView.addOnScrollListener(object: RecyclerView.OnScrollListener() { override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { if (dy != 0) {