mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle possible null call in alerts

Browse source
This commit is contained in:
Sylvain Berfini 2024-01-11 10:57:42 +01:00
parent ee8c36f70b
commit 4dc660a52d
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -300,11 +300,19 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() {
@WorkerThread
override fun onNewAlertTriggered(core: Core, alert: Alert) {
val remote = alert.call.remoteAddress.asStringUriOnly()
val call = alert.call
if (call == null) {
Log.w(
"$TAG Alert of type [${alert.type}] triggered but with null call, ignoring..."
)
return
}
val remote = call.remoteAddress.asStringUriOnly()
Log.w("$TAG Alert of type [${alert.type}] triggered for call from [$remote]")
alert.addListener(alertListener)
if (alert.call != currentCall) {
if (call != currentCall) {
Log.w("$TAG Terminated alert wasn't for current call, do not display it")
return
}
@ -352,11 +360,19 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() {
private val alertListener = object : AlertListenerStub() {
@WorkerThread
override fun onTerminated(alert: Alert) {
val remote = alert.call.remoteAddress.asStringUriOnly()
val call = alert.call
if (call == null) {
Log.w(
"$TAG Alert of type [${alert.type}] dismissed but with null call, ignoring..."
)
return
}
val remote = call.remoteAddress.asStringUriOnly()
Log.w("$TAG Alert of type [${alert.type}] dismissed for call from [$remote]")
alert.removeListener(this)
if (alert.call != currentCall) {
if (call != currentCall) {
Log.w("$TAG Terminated alert wasn't for current call, do not display it")
return
}