From b9e1290d35452757edeb94a243e478a78724ad8b Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Thu, 6 Apr 2023 15:25:11 +0300
Subject: [PATCH] Removed reduntant isAudioFocused variable

---
 app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt | 3 +--
 app/src/main/kotlin/com/tutpro/baresip/Utils.kt          | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
index eb2763b9..e5c32df1 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
@@ -1531,7 +1531,6 @@ class BaresipService: Service() {
 
         var isServiceRunning = false
         var isConfigInitialized = false
-        var isAudioFocused = false
         var libraryLoaded = false
         var callVolume = 0
         var dynDns = false
@@ -1564,8 +1563,8 @@ class BaresipService: Service() {
         val serviceEvents = mutableListOf<ServiceEvent>()
         // <aor, password> of those accounts that have auth username without auth password
         val aorPasswords = mutableMapOf<String, String>()
+        var audioFocusRequest: AudioFocusRequestCompat? = null
 
-        private var audioFocusRequest: AudioFocusRequestCompat? = null
         private var btAdapter: BluetoothAdapter? = null
 
         fun requestAudioFocus(ctx: Context): Boolean  {
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Utils.kt b/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
index 11486dbc..32e1f7c3 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
@@ -926,7 +926,7 @@ object Utils {
                     Log.d(TAG, "Setting com device to TYPE_BUILTIN_EARPIECE")
                     if (!am.setCommunicationDevice(speakerDevice))
                         Log.e(TAG, "Could not set com device")
-                    if (BaresipService.isAudioFocused && am.mode == AudioManager.MODE_NORMAL) {
+                    if (BaresipService.audioFocusRequest != null && am.mode == AudioManager.MODE_NORMAL) {
                         Log.d(TAG, "Setting mode to communication")
                         am.mode = AudioManager.MODE_IN_COMMUNICATION
                     }