gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-31 00:25:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

set "all" parameter to false and set to null only before API call

Browse Source 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
This commit is contained in:
sowjanyakch 2024-11-08 15:12:51 +01:00 committed by Marcel Hibbe
parent d09b7b5a07
commit 90628c34ce
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt
View File

@ -264,7 +264,7 @@ class CallActivity : CallBaseActivity() {
override fun onCallEndedForAll() { override fun onCallEndedForAll() {
Log.d(TAG, "A moderator ended the call for all.") Log.d(TAG, "A moderator ended the call for all.")
hangup(true, null) hangup(true, false)
} }
} }
private var callParticipantList: CallParticipantList? = null private var callParticipantList: CallParticipantList? = null
@ -272,7 +272,7 @@ class CallActivity : CallBaseActivity() {
private var isBreakoutRoom = false private var isBreakoutRoom = false
private val localParticipantMessageListener = LocalParticipantMessageListener { token -> private val localParticipantMessageListener = LocalParticipantMessageListener { token ->
switchToRoomToken = token switchToRoomToken = token
hangup(true, null) hangup(true, false)
} }
private val offerMessageListener = OfferMessageListener { sessionId, roomType, sdp, nick -> private val offerMessageListener = OfferMessageListener { sessionId, roomType, sdp, nick ->
getOrCreatePeerConnectionWrapperForSessionIdAndType( getOrCreatePeerConnectionWrapperForSessionIdAndType(
@ -502,7 +502,7 @@ class CallActivity : CallBaseActivity() {
} }
.setNegativeButton(R.string.nc_no) { _, _ -> .setNegativeButton(R.string.nc_no) { _, _ ->
recordingConsentGiven = false recordingConsentGiven = false
hangup(true, null) hangup(true, false)
} }
viewThemeUtils.dialog.colorMaterialAlertDialogBackground(this, materialAlertDialogBuilder) viewThemeUtils.dialog.colorMaterialAlertDialogBackground(this, materialAlertDialogBuilder)
@ -671,7 +671,7 @@ class CallActivity : CallBaseActivity() {
if (isOneToOneConversation) { if (isOneToOneConversation) {
binding!!.hangupButton.setOnLongClickListener { binding!!.hangupButton.setOnLongClickListener {
hangup(true, null) hangup(true, false)
true true
} }
binding!!.hangupButton.setOnClickListener { binding!!.hangupButton.setOnClickListener {
@ -685,7 +685,7 @@ class CallActivity : CallBaseActivity() {
} }
} }
binding!!.hangupButton.setOnClickListener { binding!!.hangupButton.setOnClickListener {
hangup(true, null) hangup(true, false)
} }
} }
@ -705,7 +705,7 @@ class CallActivity : CallBaseActivity() {
binding!!.callStates.callStateRelativeLayout.setOnClickListener { binding!!.callStates.callStateRelativeLayout.setOnClickListener {
if (currentCallStatus === CallStatus.CALLING_TIMEOUT) { if (currentCallStatus === CallStatus.CALLING_TIMEOUT) {
setCallState(CallStatus.RECONNECTING) setCallState(CallStatus.RECONNECTING)
hangupNetworkCalls(false, null) hangupNetworkCalls(false, false)
} }
} }
binding!!.callRecordingIndicator.setOnClickListener { binding!!.callRecordingIndicator.setOnClickListener {
@ -1500,7 +1500,7 @@ class CallActivity : CallBaseActivity() {
Log.d(TAG, "localStream is null") Log.d(TAG, "localStream is null")
} }
if (currentCallStatus !== CallStatus.LEAVING) { if (currentCallStatus !== CallStatus.LEAVING) {
hangup(true, null) hangup(true, false)
} }
powerManagerUtils!!.updatePhoneState(PowerManagerUtils.PhoneState.IDLE) powerManagerUtils!!.updatePhoneState(PowerManagerUtils.PhoneState.IDLE)
super.onDestroy() super.onDestroy()
@ -1784,7 +1784,7 @@ class CallActivity : CallBaseActivity() {
override fun onError(e: Throwable) { override fun onError(e: Throwable) {
Log.e(TAG, "Failed to join call", e) Log.e(TAG, "Failed to join call", e)
Snackbar.make(binding!!.root, R.string.nc_common_error_sorry, Snackbar.LENGTH_LONG).show() Snackbar.make(binding!!.root, R.string.nc_common_error_sorry, Snackbar.LENGTH_LONG).show()
hangup(true, null) hangup(true, false)
} }
override fun onComplete() { override fun onComplete() {
@ -1935,7 +1935,7 @@ class CallActivity : CallBaseActivity() {
Log.d(TAG, "onMessageEvent 'hello'") Log.d(TAG, "onMessageEvent 'hello'")
if (!webSocketCommunicationEvent.getHashMap()!!.containsKey("oldResumeId")) { if (!webSocketCommunicationEvent.getHashMap()!!.containsKey("oldResumeId")) {
if (currentCallStatus === CallStatus.RECONNECTING) { if (currentCallStatus === CallStatus.RECONNECTING) {
hangup(false, null) hangup(false, false)
} else { } else {
setCallState(CallStatus.RECONNECTING) setCallState(CallStatus.RECONNECTING)
runOnUiThread { initiateCall() } runOnUiThread { initiateCall() }
@ -2011,7 +2011,7 @@ class CallActivity : CallBaseActivity() {
} }
} }
private fun hangup(shutDownView: Boolean, endCallForAll: Boolean?) { private fun hangup(shutDownView: Boolean, endCallForAll: Boolean) {
Log.d(TAG, "hangup! shutDownView=$shutDownView") Log.d(TAG, "hangup! shutDownView=$shutDownView")
if (shutDownView) { if (shutDownView) {
setCallState(CallStatus.LEAVING) setCallState(CallStatus.LEAVING)
@ -2079,15 +2079,16 @@ class CallActivity : CallBaseActivity() {
hangupNetworkCalls(shutDownView, endCallForAll) hangupNetworkCalls(shutDownView, endCallForAll)
} }
private fun hangupNetworkCalls(shutDownView: Boolean, endCallForAll: Boolean?) { private fun hangupNetworkCalls(shutDownView: Boolean, endCallForAll: Boolean) {
Log.d(TAG, "hangupNetworkCalls. shutDownView=$shutDownView") Log.d(TAG, "hangupNetworkCalls. shutDownView=$shutDownView")
val apiVersion = ApiUtils.getCallApiVersion(conversationUser, intArrayOf(ApiUtils.API_V4, 1)) val apiVersion = ApiUtils.getCallApiVersion(conversationUser, intArrayOf(ApiUtils.API_V4, 1))
if (callParticipantList != null) { if (callParticipantList != null) {
callParticipantList!!.removeObserver(callParticipantListObserver) callParticipantList!!.removeObserver(callParticipantListObserver)
callParticipantList!!.destroy() callParticipantList!!.destroy()
} }
val endCall: Boolean? = if(endCallForAll) true else null
ncApi!!.leaveCall(credentials, ApiUtils.getUrlForCall(apiVersion, baseUrl, roomToken!!), endCallForAll) ncApi!!.leaveCall(credentials, ApiUtils.getUrlForCall(apiVersion, baseUrl, roomToken!!), endCall)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(object : Observer<GenericOverall> { .subscribe(object : Observer<GenericOverall> {
@ -2181,7 +2182,7 @@ class CallActivity : CallBaseActivity() {
ApplicationWideCurrentRoomHolder.getInstance().isInCall ApplicationWideCurrentRoomHolder.getInstance().isInCall
) { ) {
Log.d(TAG, "Most probably a moderator ended the call for all.") Log.d(TAG, "Most probably a moderator ended the call for all.")
hangup(true, null) hangup(true, false)
return return
} }
@ -2308,7 +2309,7 @@ class CallActivity : CallBaseActivity() {
context.resources.getString(R.string.nc_common_error_sorry), context.resources.getString(R.string.nc_common_error_sorry),
Snackbar.LENGTH_LONG Snackbar.LENGTH_LONG
).show() ).show()
hangup(true, null) hangup(true, false)
return null return null
} }
peerConnectionWrapper = if (hasMCU && publisher) { peerConnectionWrapper = if (hasMCU && publisher) {
@ -2624,7 +2625,7 @@ class CallActivity : CallBaseActivity() {
} }
CallStatus.CALLING_TIMEOUT -> handler!!.post { CallStatus.CALLING_TIMEOUT -> handler!!.post {
hangup(false, null) hangup(false, false)
binding!!.callStates.callStateTextView.setText(R.string.nc_call_timeout) binding!!.callStates.callStateTextView.setText(R.string.nc_call_timeout)
binding!!.callModeTextView.text = descriptionForCallType binding!!.callModeTextView.text = descriptionForCallType
if (binding!!.callStates.callStateRelativeLayout.visibility != View.VISIBLE) { if (binding!!.callStates.callStateRelativeLayout.visibility != View.VISIBLE) {
@ -2894,7 +2895,7 @@ class CallActivity : CallBaseActivity() {
if (iceConnectionState == IceConnectionState.FAILED) { if (iceConnectionState == IceConnectionState.FAILED) {
setCallState(CallStatus.PUBLISHER_FAILED) setCallState(CallStatus.PUBLISHER_FAILED)
webSocketClient!!.clearResumeId() webSocketClient!!.clearResumeId()
hangup(false, null) hangup(false, false)
} }
} }
} }