From ed3c26aac669d56f9e5e4ea292ea5c7650eedd8a Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 24 Apr 2022 11:22:20 +0200 Subject: [PATCH] Revert "Home pager: avoid re-applying space id that we persisted onPause" This doesn't work. This reverts commit 23f4f72ba338c0479c0b8099c56ee2b2b92ac71a. Change-Id: Ia1d1769deef4fbb9ae8e19ee91e931ac2f859570 --- .../im/vector/app/features/home/HomeDetailFragment.kt | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt index 7e73abff1a..27bf07cce7 100644 --- a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt @@ -70,8 +70,6 @@ import timber.log.Timber import javax.inject.Inject import kotlin.math.abs -private const val NO_PENDING_SPACE_ID = "de.spiritcroc.riotx.SPACE_ID_NONE" - class HomeDetailFragment @Inject constructor( private val avatarRenderer: AvatarRenderer, private val colorProvider: ColorProvider, @@ -109,7 +107,6 @@ class HomeDetailFragment @Inject constructor( private var pagerSpaces: List? = null private var pagerTab: HomeTab? = null private var pagerPagingEnabled: Boolean = false - private var pendingSpaceId: String? = NO_PENDING_SPACE_ID override fun getMenuRes() = R.menu.room_list @@ -297,8 +294,6 @@ class HomeDetailFragment @Inject constructor( // Persist swiped appStateHandler.persistSelectedSpace() - // Remember the persisted value, so we can ignore it once the listeners are running again - pendingSpaceId = getSpaceIdForPageIndex(views.roomListContainerPager.currentItem) } private fun checkNotificationTabStatus(enableDialPad: Boolean? = null) { @@ -561,11 +556,6 @@ class HomeDetailFragment @Inject constructor( if (!changed) { if (pagingEnabled) { // No need to re-setup pager, just check for selected page - // If it's a pendingSpaceId, we want to ignore it too, since we created it - if (pendingSpaceId == selectedSpaceId) { - pendingSpaceId = NO_PENDING_SPACE_ID - return - } if (selectedIndex != null) { if (selectedIndex != views.roomListContainerPager.currentItem) { // post() mitigates a case where we could end up in an endless loop circling around the same few spaces @@ -598,7 +588,6 @@ class HomeDetailFragment @Inject constructor( pagerTab = tab pagerPagingEnabled = pagingEnabled initialPageSelected = false - pendingSpaceId = NO_PENDING_SPACE_ID // OFFSCREEN_PAGE_LIMIT_DEFAULT: default recyclerview caching mechanism instead of explicit fixed prefetching //views.roomListContainerPager.offscreenPageLimit = 2