Skip to content

Commit

Permalink
Fix checkstyle
Browse files Browse the repository at this point in the history
  • Loading branch information
JcMinarro committed May 24, 2024
1 parent 56b7c4e commit 7a0079d
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@ internal class ThrottlingPlugin : Plugin {
parentId: String,
limit: Int,
lastId: String?,
) {

}
) { /* No-op */ }

override fun onUserSet(user: User) { /* No-op */ }
override fun onUserDisconnected() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1032,7 +1032,8 @@ public class MessageListController(
private fun loadNewerChannelMessages(baseMessageId: String, messageLimit: Int = this.messageLimit) {
if (channelState.value?.endOfNewerMessages?.value == true) {
logger.d {
"[loadNewerChannelMessages] rejected; endOfNewerMessages: ${channelState.value?.endOfNewerMessages?.value}"
"[loadNewerChannelMessages] rejected; endOfNewerMessages: " +
"${channelState.value?.endOfNewerMessages?.value}"
}
return
}
Expand All @@ -1042,7 +1043,9 @@ public class MessageListController(
private fun loadNewerMessagesInThread(
threadMode: MessageMode.MessageThread,
) {
logger.d { "[loadNewerMessagesInThread] endOfNewerMessages: ${threadMode.threadState?.endOfNewerMessages?.value}" }
logger.d {
"[loadNewerMessagesInThread] endOfNewerMessages: ${threadMode.threadState?.endOfNewerMessages?.value}"
}
if (threadMode.threadState?.endOfNewerMessages?.value == true ||
threadMode.threadState?.loading?.value == true ||
!threadLoadOrderOlderToNewer
Expand All @@ -1055,10 +1058,12 @@ public class MessageListController(
}
return
}
logger.d { "[loadNewerMessagesInThread] loading newer messages:" +
"parentId: ${threadMode.parentMessage.id}, " +
"messageLimit: $messageLimit, " +
"lastId = ${threadMode.threadState?.newestInThread?.value?.id}" }
logger.d {
"[loadNewerMessagesInThread] loading newer messages:" +
"parentId: ${threadMode.parentMessage.id}, " +
"messageLimit: $messageLimit, " +
"lastId = ${threadMode.threadState?.newestInThread?.value?.id}"
}
chatClient.getNewerReplies(
parentId = threadMode.parentMessage.id,
limit = messageLimit,
Expand Down Expand Up @@ -1092,6 +1097,7 @@ public class MessageListController(
* @param threadMode Current thread mode containing information about the thread.
* @param messageLimit The size of the message list page to load.
*/
@Suppress("ComplexCondition")
private fun threadLoadMore(threadMode: MessageMode.MessageThread, messageLimit: Int = this.messageLimit) {
if (_threadListState.value.endOfOldMessagesReached ||
_threadListState.value.isLoadingOlderMessages ||
Expand Down Expand Up @@ -1150,7 +1156,7 @@ public class MessageListController(
val threadState = chatClient.awaitRepliesAsState(
parentMessage.id,
DEFAULT_MESSAGES_LIMIT,
threadLoadOrderOlderToNewer
threadLoadOrderOlderToNewer,
)
val channelState = channelState.value ?: return

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ class MessagesActivity : AppCompatActivity() {
private lateinit var binding: ActivityMessagesBinding

private val factory: MessageListViewModelFactory by lazy {
MessageListViewModelFactory(this, threadLoadOlderToNewer = true, requireNotNull(intent.getStringExtra(EXTRA_CID)))
MessageListViewModelFactory(
context = this,
threadLoadOlderToNewer = true,
cid = requireNotNull(intent.getStringExtra(EXTRA_CID)),
)
}
private val messageListHeaderViewModel: MessageListHeaderViewModel by viewModels { factory }
private val messageListViewModel: MessageListViewModel by viewModels { factory }
Expand Down

0 comments on commit 7a0079d

Please sign in to comment.