Fix build variants (#1133)

tchapgouv · Nov 16, 2024 · ec0e479 · ec0e479
1 parent dc6c101
commit ec0e479
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 2 deletions.
diff --git a/...res/call/audio/MicrophoneAccessService.kt → ...res/call/audio/MicrophoneAccessService.kt b/...res/call/audio/MicrophoneAccessService.kt → ...res/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
@@ -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
@@ -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()