Skip to content

show call started info in chat message #6226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sowjanyakch wants to merge 1 commit into
base: master
Choose a base branch
from
Open

show call started info in chat message #6226

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ import com.nextcloud.talk.conversationinfo.ConversationInfoActivity
import com.nextcloud.talk.conversationinfo.viewmodel.ConversationInfoViewModel
import com.nextcloud.talk.conversationlist.ConversationsListActivity
import com.nextcloud.talk.dagger.modules.ViewModelFactoryWithParams
import com.nextcloud.talk.data.database.mappers.toDomainModel
import com.nextcloud.talk.data.network.NetworkMonitor
import com.nextcloud.talk.data.user.model.User
import com.nextcloud.talk.databinding.ActivityChatBinding
Expand Down Expand Up @@ -1263,7 +1264,7 @@ class ChatActivity :
spreedCapabilities = state.spreedCapabilities
chatApiVersion = ApiUtils.getChatApiVersion(spreedCapabilities, intArrayOf(1))
participantPermissions = ParticipantPermissions(spreedCapabilities, currentConversation!!)

updateCallStartedIndicator(currentConversation)
invalidateOptionsMenu()
isEventConversation()
checkShowCallButtons()
Expand All @@ -1282,7 +1283,7 @@ class ChatActivity :
currentConversation = state.conversationModel
chatApiVersion = ApiUtils.getChatApiVersion(spreedCapabilities, intArrayOf(1))
participantPermissions = ParticipantPermissions(spreedCapabilities, state.conversationModel!!)

updateCallStartedIndicator(currentConversation)
supportFragmentManager.commit {
setReorderingAllowed(true) // optimizes out redundant replace operations
replace(R.id.fragment_container_activity_chat, messageInputFragment)
Expand Down Expand Up @@ -1400,7 +1401,7 @@ class ChatActivity :
when (state) {
is ChatViewModel.JoinRoomSuccessState -> {
currentConversation = state.conversationModel

updateCallStartedIndicator(state.conversationModel)
sessionIdAfterRoomJoined = currentConversation!!.sessionId
ApplicationWideCurrentRoomHolder.getInstance().session = currentConversation!!.sessionId
ApplicationWideCurrentRoomHolder.getInstance().currentRoomToken = currentConversation!!.token
Expand Down Expand Up @@ -1803,6 +1804,12 @@ class ChatActivity :
}
}

private fun updateCallStartedIndicator(conversationModel: ConversationModel?) {
val lastMessage = conversationModel?.lastMessage?.toDomainModel()
val shouldShow = lastMessage?.systemMessageType == ChatMessage.SystemMessageType.CALL_STARTED
messageInputViewModel.showCallStartedIndicator((lastMessage ?: ChatMessage()), shouldShow)
}

private fun removeUnreadMessagesMarker() {
chatViewModel.setUnreadMessagesMarker(false)
}
Expand Down
Loading