From 7fedcbb9981edfa61236666d14e3fbc90d5f2065 Mon Sep 17 00:00:00 2001 From: ariskotsomitopoulos Date: Wed, 1 Dec 2021 13:04:20 +0000 Subject: [PATCH 1/2] Fix issue 4600 that search results sometimes are not displayed properly --- changelog.d/4600.misc | 1 + .../home/room/detail/search/SearchResultController.kt | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) create mode 100644 changelog.d/4600.misc diff --git a/changelog.d/4600.misc b/changelog.d/4600.misc new file mode 100644 index 0000000000..e877a33b29 --- /dev/null +++ b/changelog.d/4600.misc @@ -0,0 +1 @@ +At the very first room search after opening the app sometimes no results are displayed diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt index edef92ee2d..1b4d9faaec 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt @@ -54,10 +54,6 @@ class SearchResultController @Inject constructor( fun loadMore() } - init { - setData(null) - } - override fun buildModels(data: SearchViewState?) { data ?: return From f8f5e7ecd319075da06e307bd676a54e5b336290 Mon Sep 17 00:00:00 2001 From: ariskotsomitopoulos Date: Wed, 1 Dec 2021 16:03:04 +0000 Subject: [PATCH 2/2] Remove some other not needed setData(null) in controllers --- .../app/features/roomprofile/alias/RoomAliasController.kt | 4 ---- .../roomprofile/banned/RoomBannedMemberListController.kt | 4 ---- .../features/roomprofile/members/RoomMemberListController.kt | 4 ---- .../notifications/RoomNotificationSettingsController.kt | 4 ---- .../roomprofile/permissions/RoomPermissionsController.kt | 4 ---- .../features/roomprofile/settings/RoomSettingsController.kt | 4 ---- .../roomprofile/uploads/files/UploadsFileController.kt | 4 ---- .../roomprofile/uploads/media/UploadsMediaController.kt | 4 ---- .../app/features/spaces/people/SpacePeopleListController.kt | 4 ---- 9 files changed, 36 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt index a1c252d356..03e6ab9984 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt @@ -63,10 +63,6 @@ class RoomAliasController @Inject constructor( var callback: Callback? = null - init { - setData(null) - } - override fun buildModels(data: RoomAliasViewState?) { data ?: return diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListController.kt index 1336f8680c..f95d1a8c24 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListController.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListController.kt @@ -42,10 +42,6 @@ class RoomBannedMemberListController @Inject constructor( var callback: Callback? = null - init { - setData(null) - } - override fun buildModels(data: RoomBannedMemberListViewState?) { val bannedList = data?.bannedMemberSummaries?.invoke() ?: return val host = this diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt index 1b58130d85..86ce25a809 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt @@ -49,10 +49,6 @@ class RoomMemberListController @Inject constructor( var callback: Callback? = null - init { - setData(null) - } - override fun buildModels(data: RoomMemberListViewState?) { data ?: return val host = this diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsController.kt index 9a2085a7e8..8f6e8f54c1 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsController.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsController.kt @@ -34,10 +34,6 @@ class RoomNotificationSettingsController @Inject constructor() : TypedEpoxyContr var callback: Callback? = null - init { - setData(null) - } - override fun buildModels(data: RoomNotificationSettingsViewState?) { val host = this data ?: return diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt index 1f2c876902..9590d1bbc3 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt @@ -108,10 +108,6 @@ class RoomPermissionsController @Inject constructor( EditablePermission.UpgradeTheRoom() ) - init { - setData(null) - } - override fun buildModels(data: RoomPermissionsViewState?) { val host = this buildProfileSection( diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt index a8eb0899ab..eef1493456 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt @@ -56,10 +56,6 @@ class RoomSettingsController @Inject constructor( var callback: Callback? = null - init { - setData(null) - } - override fun buildModels(data: RoomSettingsViewState?) { val roomSummary = data?.roomSummary?.invoke() ?: return val host = this diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt index 70240752e2..4d45c2ccfc 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt @@ -43,10 +43,6 @@ class UploadsFileController @Inject constructor( private var idx = 0 - init { - setData(null) - } - override fun buildModels(data: RoomUploadsViewState?) { data ?: return val host = this diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt index 55f28ef3b2..0a5f498b9d 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt @@ -54,10 +54,6 @@ class UploadsMediaController @Inject constructor( private val itemSize = dimensionConverter.dpToPx(IMAGE_SIZE_DP) - init { - setData(null) - } - override fun buildModels(data: RoomUploadsViewState?) { data ?: return val host = this diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt index ca1c4564f5..86d8e12ef6 100644 --- a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt +++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt @@ -50,10 +50,6 @@ class SpacePeopleListController @Inject constructor( var listener: InteractionListener? = null - init { - setData(null) - } - override fun buildModels(data: RoomMemberListViewState?) { val host = this val memberSummaries = data?.roomMemberSummaries?.invoke()