From 2b17f94c2d561b6915c6f34965199d5d345eb94d Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 3 Jan 2023 10:54:36 +0100
Subject: [PATCH] Fixed crash if null audioState returned by TelecomManager's
 Connection

---
 .../org/linphone/compatibility/Api26Compatibility.kt | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/linphone/compatibility/Api26Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api26Compatibility.kt
index d310c8211..ea67da97a 100644
--- a/app/src/main/java/org/linphone/compatibility/Api26Compatibility.kt
+++ b/app/src/main/java/org/linphone/compatibility/Api26Compatibility.kt
@@ -321,11 +321,13 @@ class Api26Compatibility {
             Log.i("[Telecom Helper] Changing audio route [${routeToString(route)}] on connection [${connection.callId}] with state [${connection.stateAsString()}]")
 
             val audioState = connection.callAudioState
-            Log.i("[Telecom Helper] Current audio route is ${routeToString(audioState.route)}")
-            if (audioState != null && audioState.route == route) {
-                Log.w("[Telecom Helper] Connection is already using this route")
-                return false
-            } else if (audioState == null) {
+            if (audioState != null) {
+                Log.i("[Telecom Helper] Current audio route is ${routeToString(audioState.route)}")
+                if (audioState.route == route) {
+                    Log.w("[Telecom Helper] Connection is already using this route")
+                    return false
+                }
+            } else {
                 Log.w("[Telecom Helper] Failed to retrieve connection's call audio state!")
                 return false
             }