mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-02-07 14:58:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Factorized code for call.terminate()/call.decline()

Browse source
This commit is contained in:
Sylvain Berfini 2024-04-09 13:33:18 +02:00
parent 0d96010865
commit 6e97466a86
5 changed files with 14 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/org/linphone/core/CoreContext.kt
View file

@ -501,21 +501,16 @@ class CoreContext @UiThread constructor(val context: Context) : HandlerThread("C
call.acceptWithParams(params)
}
@WorkerThread
fun declineCall(call: Call) {
val reason = if (core.callsNb > 1) {
Reason.Busy
} else {
Reason.Declined
}
Log.i("$TAG Declining call [$call] with reason [$reason]")
call.decline(reason)
}
@WorkerThread
fun terminateCall(call: Call) {
Log.i("$TAG Terminating call [${call.remoteAddress.asStringUriOnly()}]")
call.terminate()
if (call.dir == Call.Dir.Incoming && LinphoneUtils.isCallIncoming(call.state)) {
val reason = if (call.core.callsNb > 1) Reason.Busy else Reason.Declined
Log.i("$TAG Declining call [${call.remoteAddress.asStringUriOnly()}] with reason [$reason]")
call.decline(reason)
} else {
Log.i("$TAG Terminating call [${call.remoteAddress.asStringUriOnly()}]")
call.terminate()
}
}
@UiThread

6
app/src/main/java/org/linphone/notifications/NotificationBroadcastReceiver.kt
View file

@ -63,11 +63,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
if (intent.action == NotificationsManager.INTENT_ANSWER_CALL_NOTIF_ACTION) {
coreContext.answerCall(call)
} else {
if (LinphoneUtils.isCallIncoming(call.state)) {
coreContext.declineCall(call)
} else {
coreContext.terminateCall(call)
}
coreContext.terminateCall(call)
}
}
}

7
app/src/main/java/org/linphone/telecom/TelecomManager.kt
View file

@ -21,6 +21,7 @@ package org.linphone.telecom
import android.content.Context
import android.net.Uri
import android.telecom.DisconnectCause
import androidx.annotation.WorkerThread
import androidx.core.telecom.CallAttributesCompat
import androidx.core.telecom.CallsManager
@ -33,6 +34,7 @@ import org.linphone.core.AudioDevice
import org.linphone.core.Call
import org.linphone.core.Core
import org.linphone.core.CoreListenerStub
import org.linphone.core.Reason
import org.linphone.core.tools.Log
import org.linphone.utils.LinphoneUtils
@ -110,10 +112,7 @@ class TelecomManager @WorkerThread constructor(context: Context) {
"$TAG We're asked to terminate the call with reason [$disconnectCause]"
)
coreContext.postOnCoreThread {
Log.i(
"$TAG Terminating call [${call.remoteAddress.asStringUriOnly()}]"
)
call.terminate() // TODO FIXME: use cause
coreContext.terminateCall(call)
}
},
{ // onSetActive

2
app/src/main/java/org/linphone/ui/call/model/CallModel.kt
View file

@ -97,7 +97,7 @@ class CallModel @WorkerThread constructor(val call: Call) {
fun hangUp() {
coreContext.postOnCoreThread {
Log.i("$TAG Terminating call [${call.remoteAddress.asStringUriOnly()}]")
call.terminate()
coreContext.terminateCall(call)
}
}
}

2
app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
View file

@ -451,7 +451,7 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() {
if (::currentCall.isInitialized) {
Log.i("$TAG Terminating call [${currentCall.remoteAddress.asStringUriOnly()}]")
terminatedByUsed = true
currentCall.terminate()
coreContext.terminateCall(currentCall)
}
}
}