Skip to content

Commit cf17138

Browse files
committed
Refactor: Lazy initialize messageReceiptManager in MessageDeliveredPlugin and ChatClient
1 parent eb33b8c commit cf17138

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/ChatClient.kt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -334,13 +334,15 @@ internal constructor(
334334

335335
private var _repositoryFacade: RepositoryFacade? = null
336336

337-
internal val messageReceiptManager = MessageReceiptManager(
338-
now = now,
339-
getCurrentUser = ::getCurrentUser,
340-
channelRepository = repositoryFacade,
341-
messageReceiptRepository = repository,
342-
api = api,
343-
)
337+
internal val messageReceiptManager by lazy {
338+
MessageReceiptManager(
339+
now = now,
340+
getCurrentUser = ::getCurrentUser,
341+
channelRepository = repositoryFacade,
342+
messageReceiptRepository = repository,
343+
api = api,
344+
)
345+
}
344346

345347
private var pushNotificationReceivedListener: PushNotificationReceivedListener =
346348
PushNotificationReceivedListener { _, _ -> }

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/plugin/MessageDeliveredPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import io.getstream.result.onSuccessSuspend
3131
*/
3232
internal class MessageDeliveredPlugin(
3333
chatClient: ChatClient = ChatClient.instance(),
34-
private val messageReceiptManager: MessageReceiptManager = chatClient.messageReceiptManager,
3534
) : Plugin {
35+
private val messageReceiptManager: MessageReceiptManager by lazy { chatClient.messageReceiptManager }
3636

3737
override suspend fun onQueryChannelsResult(result: Result<List<Channel>>, request: QueryChannelsRequest) {
3838
result.onSuccessSuspend { channels ->

stream-chat-android-client/src/test/java/io/getstream/chat/android/client/plugin/MessageDeliveredPluginTest.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@ internal class MessageDeliveredPluginTest {
115115
}
116116

117117
fun get() = MessageDeliveredPlugin(
118-
chatClient = mock(),
119-
messageReceiptManager = mockMessageReceiptManager,
118+
chatClient = mock { on { messageReceiptManager } doReturn mockMessageReceiptManager },
120119
)
121120
}
122121
}

0 commit comments

Comments
 (0)