jami/jami-client-android
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-android.git synced 2025-10-30 07:58:36 +08:00
Code Issues Projects Releases Wiki Activity

call: cleanup

Browse Source 
Change-Id: I9e155b55e94844bdc32be5a4cbfdc60b3907c565
This commit is contained in:
Adrien Béraud
2021-09-24 14:03:54 -04:00
parent a1fca572a3
commit 7f05c76803
4 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ring-android/app/src/main/java/cx/ring/fragments/CallFragment.kt
View File

@ -671,7 +671,6 @@ class CallFragment : BaseSupportFragment<CallPresenter, CallView>(), CallView,
}
override fun onPrepareOptionsMenu(menu: Menu) {
Log.w(CallPresenter.TAG, "DEBUG onPrepareOptionsMenu")
presenter.prepareOptionMenu()
}
@ -700,7 +699,6 @@ class CallFragment : BaseSupportFragment<CallPresenter, CallView>(), CallView,
}
override fun displayContactBubble(display: Boolean) {
Log.w(TAG, "DEBUG fn displayContactBubble -> $display")
binding?.apply {
contactBubbleLayout.visibility = if (display) View.VISIBLE else View.GONE
}
@ -929,7 +927,6 @@ class CallFragment : BaseSupportFragment<CallPresenter, CallView>(), CallView,
isSpeakerOn: Boolean, hasMultipleCamera: Boolean, canDial: Boolean,
showPluginBtn: Boolean, onGoingCall: Boolean, hasActiveVideo: Boolean
) {
Log.w(CallPresenter.TAG, "DEBUG initMenu hasActiveVideo: $hasActiveVideo; hasMultipleCamera: $hasMultipleCamera")
binding?.apply {
callSpeakerBtn.visibility = if (hasActiveVideo) View.GONE else View.VISIBLE
callCameraSwitchBtn.isChecked = !hasActiveVideo
@ -949,7 +946,7 @@ class CallFragment : BaseSupportFragment<CallPresenter, CallView>(), CallView,
callRefuseBtn.visibility = View.GONE
callControlGroup.visibility = View.VISIBLE
callHangupBtn.visibility = View.VISIBLE
contactBubbleLayout.visibility = View.VISIBLE
contactBubbleLayout.visibility = View.VISIBLE
callMicBtn.isChecked = isMuted
}
requireActivity().invalidateOptionsMenu()
@ -1013,12 +1010,10 @@ class CallFragment : BaseSupportFragment<CallPresenter, CallView>(), CallView,
val oldH = params.height
if (videoRatio >= screenRatio) {
params.width = RelativeLayout.LayoutParams.MATCH_PARENT
params.height =
(videoHeight * rootView.width.toDouble() / videoWidth.toDouble()).toInt()
params.height = (videoHeight * rootView.width.toDouble() / videoWidth.toDouble()).toInt()
} else {
params.height = RelativeLayout.LayoutParams.MATCH_PARENT
params.width =
(videoWidth * rootView.height.toDouble() / videoHeight.toDouble()).toInt()
params.width = (videoWidth * rootView.height.toDouble() / videoHeight.toDouble()).toInt()
}
if (oldW != params.width || oldH != params.height) {
binding!!.videoSurface.layoutParams = params

9
ring-android/libjamiclient/src/main/kotlin/net/jami/call/CallPresenter.kt
View File

@ -189,7 +189,6 @@ class CallPresenter @Inject constructor(
}
fun prepareOptionMenu() {
Log.w(TAG, "DEBUG prepareOptionMenu")
val isSpeakerOn: Boolean = mHardwareService.isSpeakerphoneOn
//boolean hasContact = mSipCall != null && null != mSipCall.getContact() && mSipCall.getContact().isUnknown();
val conference = mConference
@ -356,7 +355,7 @@ class CallPresenter @Inject constructor(
private fun confUpdate(call: Conference) {
mConference = call
Log.w(TAG, "DEBUG confUpdate " + call.id + " " + call.state)
Log.w(TAG, "confUpdate " + call.id + " " + call.state)
val status = call.state
if (status === CallStatus.HOLD) {
if (call.isSimpleCall) mCallService.unhold(call.id) else JamiService.addMainParticipant(call.id)
@ -364,10 +363,8 @@ class CallPresenter @Inject constructor(
val hasVideo = call.hasVideo()
val hasActiveVideo = call.hasActiveVideo()
videoIsMuted = !hasActiveVideo
val view = view ?: return
view.updateMenu()
if (call.isOnGoing) {
mOnGoingCall = true
view.initNormalStateDisplay(isMicrophoneMuted)
@ -436,11 +433,10 @@ class CallPresenter @Inject constructor(
}
private fun onVideoEvent(event: VideoEvent) {
Log.w(TAG, "DEBUG onVideoEvent $event")
Log.w(TAG, "onVideoEvent $event")
val view = view ?: return
val conference = mConference
if (event.callId == null) {
Log.w(TAG, "DEBUG onVideoEvent $event; callId == null; event.start: ${event.start}, event.started: ${event.started}")
if (event.start) {
view.displayLocalVideo(true)
}
@ -450,7 +446,6 @@ class CallPresenter @Inject constructor(
view.resetPreviewVideoSize(previewWidth, previewHeight, event.rot)
}
} else if (conference != null && conference.id == event.callId) {
Log.w(TAG, "DEBUG onVideoEvent $event; onference != null && conference.id: ${conference.id} == event.callId: ${event.callId}; event.start: ${event.start}, event.started: ${event.started}")
if (event.start) {
view.displayPeerVideo(true)
} else if (event.started) {

2
ring-android/libjamiclient/src/main/kotlin/net/jami/services/CallService.kt
View File

@ -521,7 +521,7 @@ class CallService(
val conversation = account.getByUri(contact.conversationUri.blockingFirst())
call.contact = contact
call.conversation = conversation
Log.w(TAG, "parseCallState " + contact + " " + contact.conversationUri.blockingFirst() + " " + conversation + " " + conversation!!.participant)
Log.w(TAG, "parseCallState " + contact + " " + contact.conversationUri.blockingFirst() + " " + conversation + " " + conversation?.participant)
currentCalls[callId] = call
updateConnectionCount()
}

2
ring-android/libjamiclient/src/main/kotlin/net/jami/services/ConversationFacade.kt
View File

@ -493,7 +493,7 @@ class ConversationFacade(
val account = mAccountService.getAccount(call.account!!) ?: return
val contact = call.contact
val conversationId = call.conversationId
Log.w(TAG, "CallStateChange " + call.daemonIdString + " conversationId:" + conversationId)
Log.w(TAG, "CallStateChange " + call.daemonIdString + " conversationId:" + conversationId + " contact:" + contact + " " + contact?.conversationUri?.blockingFirst())
val conversation = if (conversationId == null)
if (contact == null)
null