Merge pull request #4799 from vector-im/feature/adm/inconsistent-outgoing-call-output

Outgoing call ringtone using wrong audio device

Author: bmarty

changelog.d/4781.bugfix

@@ -0,0 +1 @@
+Tentative fix for the speaker being used instead of earpiece for the outgoing call ringtone on lineage os

vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt

@@ -28,6 +28,8 @@ import android.os.VibrationEffect
 import android.os.Vibrator
 import androidx.core.content.getSystemService
 import im.vector.app.R
+import im.vector.app.features.call.audio.CallAudioManager.Mode
+import im.vector.app.features.call.webrtc.WebRtcCallManager
 import im.vector.app.features.notifications.NotificationUtils
 import org.matrix.android.sdk.api.extensions.orFalse
 import timber.log.Timber
@@ -94,15 +96,16 @@ class CallRingPlayerIncoming(
 }
 
 class CallRingPlayerOutgoing(
-        context: Context
+        context: Context,
+        private val callManager: WebRtcCallManager
 ) {
 
     private val applicationContext = context.applicationContext
 
     private var player: MediaPlayer? = null
 
     fun start() {
-        applicationContext.getSystemService<AudioManager>()?.mode = AudioManager.MODE_IN_COMMUNICATION
+        callManager.setAudioModeToCallType()
         player?.release()
         player = createPlayer()
         if (player != null) {
@@ -120,6 +123,11 @@ class CallRingPlayerOutgoing(
         }
     }
 
+    private fun WebRtcCallManager.setAudioModeToCallType() {
+        val callMode = if (currentCall.get()?.mxCall?.isVideoCall.orFalse()) Mode.VIDEO_CALL else Mode.AUDIO_CALL
+        audioManager.setMode(callMode)
+    }
+
     fun stop() {
         player?.release()
         player = null

vector/src/main/java/im/vector/app/core/services/CallService.kt

@@ -84,7 +84,7 @@ class CallService : VectorService() {
         super.onCreate()
         notificationManager = NotificationManagerCompat.from(this)
         callRingPlayerIncoming = CallRingPlayerIncoming(applicationContext, notificationUtils)
-        callRingPlayerOutgoing = CallRingPlayerOutgoing(applicationContext)
+        callRingPlayerOutgoing = CallRingPlayerOutgoing(applicationContext, callManager)
     }
 
     override fun onDestroy() {