diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 1f4eb1ef93..a15f56a045 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -44,7 +44,6 @@
-
@@ -58,6 +57,9 @@
+
+
+
diff --git a/vector/src/withdmvoip/java/im/vector/app/features/call/VectorCallActivity.kt b/vector/src/withdmvoip/java/im/vector/app/features/call/VectorCallActivity.kt
index 483fdf8d71..7919320871 100644
--- a/vector/src/withdmvoip/java/im/vector/app/features/call/VectorCallActivity.kt
+++ b/vector/src/withdmvoip/java/im/vector/app/features/call/VectorCallActivity.kt
@@ -251,26 +251,24 @@ class VectorCallActivity :
}
private fun startMicrophoneService() {
- if (ContextCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO)
- == PackageManager.PERMISSION_GRANTED) {
-
- // Only start the service if the app is in the foreground
- if (isAppInForeground()) {
- Timber.tag(loggerTag.value).v("Starting microphone foreground service")
- val intent = Intent(this, MicrophoneAccessService::class.java)
- ContextCompat.startForegroundService(this, intent)
- } else {
- Timber.tag(loggerTag.value).v("App is not in foreground; cannot start microphone service")
- }
- } else {
- Timber.tag(loggerTag.value).v("Microphone permission not granted; cannot start service")
+ val isConnected = withState(callViewModel) {
+ val callState = it.callState.invoke()
+ callState is CallState.Connected
}
+ if (!isAppInForeground()) return
+ if (!isConnected) return
+ if (ContextCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_DENIED) return
+
+ Timber.tag(loggerTag.value).d("Starting microphone foreground service")
+ val intent = Intent(this, MicrophoneAccessService::class.java)
+ ContextCompat.startForegroundService(this, intent)
}
private fun isAppInForeground(): Boolean {
val appProcess = ProcessLifecycleOwner.get().lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)
return appProcess
}
+
private fun stopMicrophoneService() {
Timber.tag(loggerTag.value).d("Stopping MicrophoneAccessService (if needed).")
val intent = Intent(this, MicrophoneAccessService::class.java)
@@ -292,6 +290,7 @@ class VectorCallActivity :
turnScreenOffAndKeyguardOn()
removeOnPictureInPictureModeChangedListener(pictureInPictureModeChangedInfoConsumer)
screenCaptureServiceConnection.unbind()
+ stopMicrophoneService()
super.onDestroy()
}
diff --git a/vector/src/withvoip/java/im/vector/app/features/call/VectorCallActivity.kt b/vector/src/withvoip/java/im/vector/app/features/call/VectorCallActivity.kt
index 4480126038..7919320871 100644
--- a/vector/src/withvoip/java/im/vector/app/features/call/VectorCallActivity.kt
+++ b/vector/src/withvoip/java/im/vector/app/features/call/VectorCallActivity.kt
@@ -16,12 +16,14 @@
package im.vector.app.features.call
+import android.Manifest
import android.app.Activity
import android.app.KeyguardManager
import android.app.PictureInPictureParams
import android.content.Context
import android.content.Intent
import android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP
+import android.content.pm.PackageManager
import android.graphics.Color
import android.media.projection.MediaProjection
import android.media.projection.MediaProjectionManager
@@ -40,6 +42,8 @@ import androidx.core.content.getSystemService
import androidx.core.util.Consumer
import androidx.core.view.isInvisible
import androidx.core.view.isVisible
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.ProcessLifecycleOwner
import com.airbnb.mvrx.Fail
import com.airbnb.mvrx.Mavericks
import com.airbnb.mvrx.viewModel
@@ -57,6 +61,7 @@ import im.vector.app.core.utils.PERMISSIONS_FOR_VIDEO_IP_CALL
import im.vector.app.core.utils.checkPermissions
import im.vector.app.core.utils.registerForPermissionsResult
import im.vector.app.databinding.ActivityCallBinding
+import im.vector.app.features.call.audio.MicrophoneAccessService
import im.vector.app.features.call.dialpad.CallDialPadBottomSheet
import im.vector.app.features.call.dialpad.DialPadFragment
import im.vector.app.features.call.transfer.CallTransferActivity
@@ -245,11 +250,47 @@ class VectorCallActivity :
}
}
+ private fun startMicrophoneService() {
+ val isConnected = withState(callViewModel) {
+ val callState = it.callState.invoke()
+ callState is CallState.Connected
+ }
+ if (!isAppInForeground()) return
+ if (!isConnected) return
+ if (ContextCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_DENIED) return
+
+ Timber.tag(loggerTag.value).d("Starting microphone foreground service")
+ val intent = Intent(this, MicrophoneAccessService::class.java)
+ ContextCompat.startForegroundService(this, intent)
+ }
+
+ private fun isAppInForeground(): Boolean {
+ val appProcess = ProcessLifecycleOwner.get().lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)
+ return appProcess
+ }
+
+ private fun stopMicrophoneService() {
+ Timber.tag(loggerTag.value).d("Stopping MicrophoneAccessService (if needed).")
+ val intent = Intent(this, MicrophoneAccessService::class.java)
+ stopService(intent)
+ }
+
+ override fun onPause() {
+ super.onPause()
+ startMicrophoneService()
+ }
+
+ override fun onResume() {
+ super.onResume()
+ stopMicrophoneService()
+ }
+
override fun onDestroy() {
detachRenderersIfNeeded()
turnScreenOffAndKeyguardOn()
removeOnPictureInPictureModeChangedListener(pictureInPictureModeChangedInfoConsumer)
screenCaptureServiceConnection.unbind()
+ stopMicrophoneService()
super.onDestroy()
}