Skip to content

Commit e2f9477

Browse files
Initialise channelListFactory lazily and provide an empty user id as a fallback (#5976)
Co-authored-by: Petar Velikov <[email protected]>
1 parent 6c08da3 commit e2f9477

File tree

1 file changed

+12
-8
lines changed
  • stream-chat-android-ui-guides/src/main/java/io/getstream/chat/android/guides/catalog/uicomponents/channelsscreen

1 file changed

+12
-8
lines changed

stream-chat-android-ui-guides/src/main/java/io/getstream/chat/android/guides/catalog/uicomponents/channelsscreen/ChannelsActivity.kt

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,18 @@ class ChannelsActivity : AppCompatActivity() {
4141

4242
private val channelListHeaderViewModel: ChannelListHeaderViewModel by viewModels()
4343

44-
private val channelListFactory: ChannelListViewModelFactory = ChannelListViewModelFactory(
45-
filter = Filters.and(
46-
Filters.eq("type", "messaging"),
47-
Filters.`in`("members", listOf(ChatClient.instance().getCurrentUser()!!.id)),
48-
),
49-
sort = QuerySortByField.descByName("last_updated"),
50-
limit = 30,
51-
)
44+
private val channelListFactory: ChannelListViewModelFactory by lazy {
45+
val chatClient = ChatClient.instance()
46+
val currentUserId = chatClient.getCurrentUser()?.id ?: ""
47+
ChannelListViewModelFactory(
48+
filter = Filters.and(
49+
Filters.eq("type", "messaging"),
50+
Filters.`in`("members", listOf(currentUserId)),
51+
),
52+
sort = QuerySortByField.descByName("last_updated"),
53+
limit = 30,
54+
)
55+
}
5256
private val channelListViewModel: ChannelListViewModel by viewModels { channelListFactory }
5357

5458
override fun onCreate(savedInstanceState: Bundle?) {

0 commit comments

Comments
 (0)