mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-10-22 18:56:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix false positive empty roomlist

Browse source
This commit is contained in:
valere 2023-02-03 11:50:17 +01:00
parent 6f859c9ca6
commit e53fbaa11d
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
View file

@ -90,9 +90,10 @@ interface CryptoService {
fun isKeyGossipingEnabled(): Boolean
/*
* Tells if the current crypto implementation supports MSC3061
* Tells if the current crypto implementation supports MSC3061
*/
fun supportsShareKeysOnInvite(): Boolean
/**
* As per MSC3061.
* If true will make it possible to share part of e2ee room history

12
vector/src/main/java/im/vector/app/features/home/room/list/home/HomeFilteredRoomsController.kt
View file

@ -26,6 +26,7 @@ import im.vector.app.features.home.room.list.RoomListListener
import im.vector.app.features.home.room.list.RoomSummaryItemFactory
import im.vector.app.features.home.room.list.RoomSummaryPlaceHolderItem_
import im.vector.app.features.settings.FontScalePreferences
import org.matrix.android.sdk.api.session.room.ResultBoundaries
import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
import org.matrix.android.sdk.api.session.room.model.RoomSummary
import javax.inject.Inject
@ -53,6 +54,8 @@ class HomeFilteredRoomsController @Inject constructor(
private val shouldUseSingleLine: Boolean
var initialLoadOccurred = false
init {
val fontScale = fontScalePreferences.getResolvedFontScaleValue()
shouldUseSingleLine = fontScale.scale > FontScalePreferences.SCALE_LARGE
@ -78,6 +81,15 @@ class HomeFilteredRoomsController @Inject constructor(
}
}
fun boundaryChange(boundary: ResultBoundaries) {
// Sometimes the room stays on empty state, need
val boundaryHasLoadedSomething = boundary.frontLoaded || boundary.zeroItemLoaded
if (initialLoadOccurred != boundaryHasLoadedSomething) {
initialLoadOccurred = boundaryHasLoadedSomething
requestForcedModelBuild()
}
}
fun submitEmptyStateData(state: StateView.State.Empty?) {
this.emptyStateData = state
}

5
vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
View file

@ -160,6 +160,11 @@ class HomeRoomListFragment :
roomListViewModel.filteredPagedRoomSummariesLive.livePagedList.observe(viewLifecycleOwner) { roomsList ->
roomsController.submitRoomsList(roomsList)
}
roomListViewModel.filteredPagedRoomSummariesLive.liveBoundaries.observe(viewLifecycleOwner) {
roomsController.boundaryChange(it)
}
roomListViewModel.onEach(HomeRoomListViewState::emptyState) { emptyState ->
roomsController.submitEmptyStateData(emptyState)
}