Skip to content

Commit

Permalink
Show Accept Call Button in Chat
Browse files Browse the repository at this point in the history
- added call_started_message.xml
- added CallStartedViewHolder.kt
- added CallStartedMessageInterface.kt
- Both join audio and join video buttons
- Gets destroyed if call ends, persists despite state changes

Signed-off-by: Julius Linus <julius.linus@nextcloud.com>
  • Loading branch information
Julius Linus authored and rapterjet2004 committed Sep 19, 2023
1 parent ab7f701 commit a92d533
Show file tree
Hide file tree
Showing 6 changed files with 332 additions and 8 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Nextcloud Talk application
*
* @author Julius Linus
* Copyright (C) 2023 Julius Linus <julius.linus@nextcloud.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.nextcloud.talk.adapters.messages

interface CallStartedMessageInterface {
fun joinAudioCall()
fun joinVideoCall()
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
/*
* Nextcloud Talk application
*
* @author Julius Linus
* Copyright (C) 2023 Julius Linus <julius.linus@nextcloud.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

package com.nextcloud.talk.adapters.messages

import android.content.Context
import android.graphics.drawable.Drawable
import android.view.View
import autodagger.AutoInjector
import coil.Coil.imageLoader
import coil.request.ImageRequest
import coil.target.Target
import coil.transform.CircleCropTransformation
import com.nextcloud.talk.application.NextcloudTalkApplication
import com.nextcloud.talk.databinding.CallStartedMessageBinding
import com.nextcloud.talk.models.json.chat.ChatMessage
import com.nextcloud.talk.ui.theme.ViewThemeUtils
import com.nextcloud.talk.users.UserManager
import com.nextcloud.talk.utils.ApiUtils
import com.stfalcon.chatkit.messages.MessageHolders
import javax.inject.Inject

@AutoInjector(NextcloudTalkApplication::class)
class CallStartedViewHolder(incomingView: View, payload: Any) :
MessageHolders.BaseIncomingMessageViewHolder<ChatMessage>(incomingView, payload) {
private val binding: CallStartedMessageBinding = CallStartedMessageBinding.bind(incomingView)

@Inject
lateinit var context: Context

@Inject
lateinit var userManager: UserManager

@Inject
lateinit var viewThemeUtils: ViewThemeUtils

private lateinit var messageInterface: CallStartedMessageInterface

override fun onBind(message: ChatMessage) {
super.onBind(message)
NextcloudTalkApplication.sharedApplication!!.componentApplication.inject(this)
themeBackground()
setUpAvatarProfile(message)
binding.callAuthorChip.text = message.actorDisplayName
binding.joinVideoCall.setOnClickListener { messageInterface.joinVideoCall() }
binding.joinAudioCall.setOnClickListener { messageInterface.joinAudioCall() }
}

private fun themeBackground() {
binding.callStartedBackground.apply {
viewThemeUtils.talk.themeOutgoingMessageBubble(this, grouped = true, false)
}

binding.callAuthorChip.apply {
viewThemeUtils.material.colorChipBackground(this)
}
}

private fun setUpAvatarProfile(message: ChatMessage) {
val user = userManager.currentUser.blockingGet()
val url: String = if (message.actorType == "guests" || message.actorType == "guest") {
ApiUtils.getUrlForGuestAvatar(
user!!.baseUrl,
message.actorDisplayName,
true
)
} else {
ApiUtils.getUrlForAvatar(user!!.baseUrl, message.actorDisplayName, true)
}

val imageRequest: ImageRequest = ImageRequest.Builder(context)
.data(url)
.crossfade(true)
.transformations(CircleCropTransformation())
.target(object : Target {
override fun onStart(placeholder: Drawable?) {
// unused atm
}

override fun onError(error: Drawable?) {
// unused atm
}

override fun onSuccess(result: Drawable) {
binding.callAuthorChip.chipIcon = result
}
})
.build()

imageLoader(context).enqueue(imageRequest)
}

fun assignCallStartedMessageInterface(inf: CallStartedMessageInterface) {
messageInterface = inf
}

companion object {
var TAG: String? = CallStartedViewHolder::class.simpleName
}

override fun viewDetached() {
// unused atm
}

override fun viewAttached() {
// unused atm
}

override fun viewRecycled() {
// unused atm
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ public void onBindViewHolder(ViewHolder holder, int position) {

} else if (holder instanceof SystemMessageViewHolder) {
((SystemMessageViewHolder) holder).assignSystemMessageInterface(chatActivity);
} else if (holder instanceof CallStartedViewHolder) {
((CallStartedViewHolder) holder).assignCallStartedMessageInterface(chatActivity);
}
}
}
91 changes: 83 additions & 8 deletions app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ import com.nextcloud.talk.R
import com.nextcloud.talk.activities.BaseActivity
import com.nextcloud.talk.activities.CallActivity
import com.nextcloud.talk.activities.TakePhotoActivity
import com.nextcloud.talk.adapters.messages.CallStartedMessageInterface
import com.nextcloud.talk.adapters.messages.CallStartedViewHolder
import com.nextcloud.talk.adapters.messages.CommonMessageInterface
import com.nextcloud.talk.adapters.messages.IncomingLinkPreviewMessageViewHolder
import com.nextcloud.talk.adapters.messages.IncomingLocationMessageViewHolder
Expand Down Expand Up @@ -267,7 +269,8 @@ class ChatActivity :
VoiceMessageInterface,
CommonMessageInterface,
PreviewMessageInterface,
SystemMessageInterface {
SystemMessageInterface,
CallStartedMessageInterface {

var active = false

Expand Down Expand Up @@ -376,6 +379,8 @@ class ChatActivity :
var typedWhileTypingTimerIsRunning: Boolean = false
val typingParticipants = HashMap<String, TypingParticipant>()

var callStarted = false

private val localParticipantMessageListener = object : SignalingMessageReceiver.LocalParticipantMessageListener {
override fun onSwitchTo(token: String?) {
if (token != null) {
Expand Down Expand Up @@ -945,6 +950,17 @@ class ChatActivity :
R.layout.item_custom_outcoming_preview_message
)

messageHolders.registerContentType(
CONTENT_TYPE_CALL_STARTED,
CallStartedViewHolder::class.java,
payload,
R.layout.call_started_message,
CallStartedViewHolder::class.java,
payload,
R.layout.call_started_message,
this
)

messageHolders.registerContentType(
CONTENT_TYPE_SYSTEM_MESSAGE,
SystemMessageViewHolder::class.java,
Expand Down Expand Up @@ -1807,7 +1823,7 @@ class ChatActivity :
}
}
}
mediaPlayerHandler.postDelayed(this, 15)
mediaPlayerHandler.postDelayed(this, MILISEC_15)
}
})

Expand Down Expand Up @@ -3160,6 +3176,26 @@ class ChatActivity :
Integer.parseInt(it)
}

try {
val mostRecentCallSystemMessage = adapter?.items?.first {
it.item is ChatMessage &&
(it.item as ChatMessage).systemMessageType != null &&
(it.item as ChatMessage).systemMessageType!!.ordinal <= ChatMessage
.SystemMessageType.CALL_TRIED.ordinal &&
(it.item as ChatMessage).systemMessageType!!.ordinal >= ChatMessage
.SystemMessageType.CALL_STARTED.ordinal
}?.item

if (mostRecentCallSystemMessage != null) {
processMostRecentMessage(
mostRecentCallSystemMessage as ChatMessage,
chatMessageList
)
}
} catch (e: java.util.NoSuchElementException) {
Log.d(TAG, "No System messages found $e")
}

updateReadStatusOfAllMessages(newXChatLastCommonRead)
adapter?.notifyDataSetChanged()

Expand Down Expand Up @@ -4203,10 +4239,38 @@ class ChatActivity :
CONTENT_TYPE_LINK_PREVIEW -> message.isLinkPreview()
CONTENT_TYPE_SYSTEM_MESSAGE -> !TextUtils.isEmpty(message.systemMessage)
CONTENT_TYPE_UNREAD_NOTICE_MESSAGE -> message.id == "-1"
CONTENT_TYPE_CALL_STARTED -> message.id == "-2"

else -> false
}
}

private fun processMostRecentMessage(recent: ChatMessage, chatMessageList: List<ChatMessage>) {
when (recent.systemMessageType) {
ChatMessage.SystemMessageType.CALL_STARTED -> {
if (!callStarted) {
val unreadChatMessage = ChatMessage()
unreadChatMessage.jsonMessageId = CALL_STARTED_ID
unreadChatMessage.actorId = "-2"
val name = if (recent.actorDisplayName.isNullOrEmpty()) "Guest" else recent.actorDisplayName
unreadChatMessage.actorDisplayName = name
unreadChatMessage.actorType = recent.actorType
unreadChatMessage.timestamp = chatMessageList[0].timestamp
unreadChatMessage.message = null
adapter?.addToStart(unreadChatMessage, false)
callStarted = true
}
} // add CallStartedMessage with id -2
ChatMessage.SystemMessageType.CALL_ENDED,
ChatMessage.SystemMessageType.CALL_MISSED,
ChatMessage.SystemMessageType.CALL_ENDED_EVERYONE -> {
adapter?.deleteById("-2")
callStarted = false
} // remove message of id -2
else -> {}
}
}

@Subscribe(threadMode = ThreadMode.BACKGROUND)
fun onMessageEvent(webSocketCommunicationEvent: WebSocketCommunicationEvent) {
/*
Expand Down Expand Up @@ -4340,6 +4404,14 @@ class ChatActivity :
}
}

override fun joinAudioCall() {
startACall(true, false)
}

override fun joinVideoCall() {
startACall(false, false)
}

private fun logConversationInfos(methodName: String) {
Log.d(TAG, " |-----------------------------------------------")
Log.d(TAG, " | method: $methodName")
Expand All @@ -4352,12 +4424,13 @@ class ChatActivity :

companion object {
private val TAG = ChatActivity::class.simpleName
private const val CONTENT_TYPE_SYSTEM_MESSAGE: Byte = 1
private const val CONTENT_TYPE_UNREAD_NOTICE_MESSAGE: Byte = 2
private const val CONTENT_TYPE_LOCATION: Byte = 3
private const val CONTENT_TYPE_VOICE_MESSAGE: Byte = 4
private const val CONTENT_TYPE_POLL: Byte = 5
private const val CONTENT_TYPE_LINK_PREVIEW: Byte = 6
private const val CONTENT_TYPE_CALL_STARTED: Byte = 1
private const val CONTENT_TYPE_SYSTEM_MESSAGE: Byte = 2
private const val CONTENT_TYPE_UNREAD_NOTICE_MESSAGE: Byte = 3
private const val CONTENT_TYPE_LOCATION: Byte = 4
private const val CONTENT_TYPE_VOICE_MESSAGE: Byte = 5
private const val CONTENT_TYPE_POLL: Byte = 6
private const val CONTENT_TYPE_LINK_PREVIEW: Byte = 7
private const val NEW_MESSAGES_POPUP_BUBBLE_DELAY: Long = 200
private const val GET_ROOM_INFO_DELAY_NORMAL: Long = 30000
private const val GET_ROOM_INFO_DELAY_LOBBY: Long = 5000
Expand Down Expand Up @@ -4420,5 +4493,7 @@ class ChatActivity :
private const val TYPING_INTERVAL_TO_SEND_NEXT_TYPING_MESSAGE = 1000L
private const val TYPING_STARTED_SIGNALING_MESSAGE_TYPE = "startedTyping"
private const val TYPING_STOPPED_SIGNALING_MESSAGE_TYPE = "stoppedTyping"
private const val CALL_STARTED_ID = -2
private const val MILISEC_15: Long = 15
}
}
Loading

0 comments on commit a92d533

Please sign in to comment.