filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

forcing the outgoing calls to use the same audio config as the call itself

Browse Source 
- tentatively fixes the speaker being used by previous instance changes if a reset fails
This commit is contained in:
Adam Brown 2021-12-22 15:57:47 +00:00
parent 55c0f1fcb3
commit eb8a704ee7
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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