From 51cf7a6711e9873274504bf81d088a77c25efa0b Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 11 Feb 2022 09:22:52 +0100 Subject: [PATCH] It seems callAudioState property on TelecomManager Connection can return null... --- .../java/org/linphone/compatibility/Api26Compatibility.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/linphone/compatibility/Api26Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api26Compatibility.kt index f49e1bdd3..a6e7be818 100644 --- a/app/src/main/java/org/linphone/compatibility/Api26Compatibility.kt +++ b/app/src/main/java/org/linphone/compatibility/Api26Compatibility.kt @@ -259,10 +259,16 @@ class Api26Compatibility { fun changeAudioRouteForTelecomManager(connection: NativeCallWrapper, route: Int): Boolean { Log.i("[Telecom Helper] Changing audio route [$route] on connection ${connection.callId}") - if (connection.callAudioState.route == route) { + + val audioState = connection.callAudioState + if (audioState != null && audioState.route == route) { Log.w("[Telecom Helper] Connection is already using this route") return false + } else if (audioState == null) { + Log.w("[Telecom Helper] Failed to retrieve connection's call audio state!") + return false } + connection.setAudioRoute(route) return true }