From ec0e479a71ba289b319486c40f96082f0ff8572b Mon Sep 17 00:00:00 2001 From: Yoan Pintas Date: Sat, 16 Nov 2024 01:50:04 +0100 Subject: [PATCH] Fix build variants (#1133) --- .../call/audio/MicrophoneAccessService.kt | 4 +- .../app/features/call/VectorCallActivity.kt | 2 +- .../app/features/call/VectorCallActivity.kt | 42 +++++++++++++++++++ 3 files changed, 46 insertions(+), 2 deletions(-) rename vector/src/{withdmvoip => main}/java/im/vector/app/features/call/audio/MicrophoneAccessService.kt (92%) diff --git a/vector/src/withdmvoip/java/im/vector/app/features/call/audio/MicrophoneAccessService.kt b/vector/src/main/java/im/vector/app/features/call/audio/MicrophoneAccessService.kt similarity index 92% rename from vector/src/withdmvoip/java/im/vector/app/features/call/audio/MicrophoneAccessService.kt rename to vector/src/main/java/im/vector/app/features/call/audio/MicrophoneAccessService.kt index 1cf2aee737..bb570442ae 100644 --- a/vector/src/withdmvoip/java/im/vector/app/features/call/audio/MicrophoneAccessService.kt +++ b/vector/src/main/java/im/vector/app/features/call/audio/MicrophoneAccessService.kt @@ -23,12 +23,14 @@ import dagger.hilt.android.AndroidEntryPoint import im.vector.app.core.extensions.startForegroundCompat import im.vector.app.core.services.VectorAndroidService import im.vector.app.features.notifications.NotificationUtils +import im.vector.lib.core.utils.timer.Clock import javax.inject.Inject @AndroidEntryPoint class MicrophoneAccessService : VectorAndroidService() { @Inject lateinit var notificationUtils: NotificationUtils + @Inject lateinit var clock: Clock private val binder = LocalBinder() override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { @@ -38,7 +40,7 @@ class MicrophoneAccessService : VectorAndroidService() { } private fun showMicrophoneAccessNotification() { - val notificationId = System.currentTimeMillis().toInt() + val notificationId = clock.epochMillis().toInt() val notification = notificationUtils.buildMicrophoneAccessNotification() startForegroundCompat(notificationId, notification) } 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..a688c6caab 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 @@ -253,7 +253,6 @@ 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") @@ -271,6 +270,7 @@ class VectorCallActivity : 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) 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..a688c6caab 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,6 +250,43 @@ 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") + } + } + + 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()