Audio related fixes

app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt

@@ -882,24 +882,25 @@ class BaresipService: Service() {
                         stopMediaPlayer()
                         val hasTelecom = ConnectionService.connections.containsKey(callp) ||
                                 ConnectionService.pendingOutgoingConnection != null
-                        if (!hasTelecom)
+                        if (!hasTelecom) {
                             setCallVolume()
                             ensureCommunicationMode()
+                        }
                         proximitySensing(proximitySensing)
                     }
                     "call ringing" -> {
-                        ConnectionService.connections[callp]?.setRinging()
+                        if (!telecom) {
                             ensureCommunicationMode()
                             playRingBack()
+                        }
                         return
                     }
                     "call progress" -> {
-                        ensureCommunicationMode()
+                        if (!telecom) ensureCommunicationMode()
                         if ((ev[1].toInt() and Api.SDP_RECVONLY) != 0)
                             stopMediaPlayer()
                         else {
-                            ConnectionService.connections[callp]?.setRinging()
+                            if (!telecom) playRingBack()
-                            playRingBack()
                         }
                         return
                     }
@@ -939,7 +940,7 @@ class BaresipService: Service() {
                                 )
                                 if (resourceId != 0) {
                                     ensureCommunicationMode()
-                                    playUnInterrupted(resourceId, 1)
+                                    if (!telecom) playUnInterrupted(resourceId, 1)
                                 } else {
                                     Log.e(TAG, "Callwaiting tone $name.wav not found")
                                 }
@@ -993,6 +994,7 @@ class BaresipService: Service() {
                     "call established" -> {
                         ConnectionService.connections[callp]?.setActive()
                         ensureCommunicationMode()
+                        stopMediaPlayer()
                         nm.cancel(CALL_NOTIFICATION_ID)
                         Log.d(TAG, "AoR $aor call $callp established")
                         call!!.status.value = "connected"
@@ -1628,9 +1630,8 @@ class BaresipService: Service() {
             .setCustomContentView(notificationLayout)
         val notification = buildStatusNotification()
         try {
-            if (VERSION.SDK_INT >= 34)
+            if (VERSION.SDK_INT >= 29)
-                startForeground(STATUS_NOTIFICATION_ID, notification,
+                startForeground(STATUS_NOTIFICATION_ID, notification, foregroundServiceType())
-                    ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
             else
                 startForeground(STATUS_NOTIFICATION_ID, notification)
         } catch (e: Exception) {
@@ -1728,14 +1729,8 @@ class BaresipService: Service() {
 
         try {
             if (activeCall != null) {
-                val type = if (VERSION.SDK_INT >= 30) {
-                    if (ContextCompat.checkSelfPermission(this, RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED)
-                        FOREGROUND_SERVICE_TYPE_PHONE_CALL or FOREGROUND_SERVICE_TYPE_MICROPHONE
-                    else
-                        FOREGROUND_SERVICE_TYPE_PHONE_CALL
-                } else 0
                 if (VERSION.SDK_INT >= 29)
-                    startForeground(STATUS_NOTIFICATION_ID, notification, type)
+                    startForeground(STATUS_NOTIFICATION_ID, notification, foregroundServiceType())
                 else
                     startForeground(STATUS_NOTIFICATION_ID, notification)
                 isNotificationInCall = true
@@ -1743,11 +1738,8 @@ class BaresipService: Service() {
                 if (isNotificationInCall) {
                     stopForeground(STOP_FOREGROUND_REMOVE)
                     isNotificationInCall = false
-                    if (VERSION.SDK_INT >= 34)
+                    if (VERSION.SDK_INT >= 29)
-                        startForeground(STATUS_NOTIFICATION_ID, notification,
+                        startForeground(STATUS_NOTIFICATION_ID, notification, foregroundServiceType())
-                            ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
-                    else if (VERSION.SDK_INT >= 30)
-                        startForeground(STATUS_NOTIFICATION_ID, notification, 0)
                     else
                         startForeground(STATUS_NOTIFICATION_ID, notification)
                 } else {
@@ -1762,6 +1754,19 @@ class BaresipService: Service() {
         }
     }
 
+    private fun foregroundServiceType(): Int {
+        return if (VERSION.SDK_INT >= 34) {
+            ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE
+        } else if (VERSION.SDK_INT >= 30) {
+            if (ContextCompat.checkSelfPermission(this, RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED)
+                FOREGROUND_SERVICE_TYPE_PHONE_CALL or FOREGROUND_SERVICE_TYPE_MICROPHONE
+            else
+                FOREGROUND_SERVICE_TYPE_PHONE_CALL
+        } else {
+            0
+        }
+    }
+
     @SuppressLint("WakelockTimeout")
     private fun updatePartialWakeLock() {
         // Hold the wake lock as long as the service is active to ensure

app/src/main/kotlin/com/tutpro/baresip/ConnectionService.kt

@@ -69,6 +69,7 @@ class ConnectionService : ConnectionService() {
                 Connection.CAPABILITY_HOLD or
                 Connection.CAPABILITY_MERGE_CONFERENCE or
                 Connection.CAPABILITY_SWAP_CONFERENCE
+        connection.audioModeIsVoip = true
 
         val call = Call.ofCallp(callp)
         if (call != null)
@@ -76,17 +77,6 @@ class ConnectionService : ConnectionService() {
 
         val ua = UserAgent.ofUap(uap)
         if (ua != null) {
-            if (BaresipService.speakerPhone || BaresipService.speakerPhoneAuto) {
-                BaresipService.speakerPhone = true
-                @Suppress("DEPRECATION")
-                connection.setAudioRoute(CallAudioState.ROUTE_SPEAKER)
-                BaresipService.postServiceEvent(
-                    ServiceEvent("speaker update,true",
-                        arrayListOf(uap, callp),
-                        System.nanoTime()
-                    )
-                )
-            }
             if (ua.account.answerMode == Api.ANSWERMODE_AUTO) {
                 Log.d(TAG, "Auto-answering call $callp")
                 connection.onAnswer()
@@ -128,23 +118,12 @@ class ConnectionService : ConnectionService() {
         val connection = BaresipConnection(uap, 0L)
         pendingOutgoingConnection = connection
 
-        if (BaresipService.speakerPhone || BaresipService.speakerPhoneAuto) {
-            BaresipService.speakerPhone = true
-            @Suppress("DEPRECATION")
-            connection.setAudioRoute(CallAudioState.ROUTE_SPEAKER)
-            BaresipService.postServiceEvent(
-                ServiceEvent("speaker update,true",
-                    arrayListOf(uap, 0L),
-                    System.nanoTime()
-                )
-            )
-        }
-
         connection.setAddress(request?.address, TelecomManager.PRESENTATION_ALLOWED)
         connection.connectionCapabilities = Connection.CAPABILITY_SUPPORT_HOLD or
                 Connection.CAPABILITY_HOLD or
                 Connection.CAPABILITY_MERGE_CONFERENCE or
                 Connection.CAPABILITY_SWAP_CONFERENCE
+        connection.audioModeIsVoip = true
 
         // Start the SIP connection logic
         if (uap != 0L) {