Restore android call service (#1134)

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

Hide file tree

Showing 4 changed files with 36 additions and 31 deletions.
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
@@ -44,7 +44,6 @@
 
     <!-- For CallAndroidService -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
 
     <!-- For VectorSyncAndroidService -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
@@ -58,6 +57,9 @@
     <!-- Jitsi SDK is now API23+ -->
     <uses-sdk tools:overrideLibrary="com.swmansion.gesturehandler,org.jitsi.meet.sdk,com.oney.WebRTCModule,com.learnium.RNDeviceInfo,com.reactnativecommunity.asyncstorage,com.ocetnik.timer,com.calendarevents,com.reactnativecommunity.netinfo,com.kevinresol.react_native_default_preference,com.rnimmersive,com.corbt.keepawake,com.BV.LinearGradient,com.horcrux.svg,com.oblador.performance,com.reactnativecommunity.slider,com.brentvatne.react,com.reactnativecommunity.clipboard,com.swmansion.gesturehandler.react,org.linusu,org.reactnative.maskedview,com.reactnativepagerview,com.swmansion.reanimated,com.th3rdwave.safeareacontext,com.swmansion.rnscreens,org.devio.rn.splashscreen,com.reactnativecommunity.webview,org.wonday.orientation" />
 
+    <!-- For MicrophoneAccessService -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
+
     <!-- Tchap: Jitsi libs adds CALENDAR permissions, but we can remove them safely
     according to https://github.com/jitsi/jitsi-meet/issues/4068#issuecomment-480482481 -->
     <uses-permission android:name="android.permission.READ_CALENDAR" tools:node="remove" />

diff --git a/vector/src/main/java/im/vector/app/core/services/CallAndroidService.kt b/vector/src/main/java/im/vector/app/core/services/CallAndroidService.kt
@@ -182,8 +182,11 @@ class CallAndroidService : VectorAndroidService() {
                 title = callInformation.opponentMatrixItem?.getBestName() ?: callInformation.opponentUserId,
                 fromBg = fromBg
         )
-        // TCHAP fix crash when a call incoming on Androd 14 and higher
-        notificationManager.notify(callId.hashCode(), notification)
+        if (knownCalls.isEmpty()) {
+            startForegroundCompat(callId.hashCode(), notification)
+        } else {
+            notificationManager.notify(callId.hashCode(), notification)
+        }
         knownCalls[callId] = callInformation
     }
 
@@ -200,8 +203,7 @@ class CallAndroidService : VectorAndroidService() {
         }
         val notification = notificationUtils.buildCallEndedNotification(false)
         val notificationId = callId.hashCode()
-        // TCHAP fix crash when a call incoming on Androd 14 and higher
-        notificationManager.notify(notificationId, notification)
+        startForegroundCompat(notificationId, notification)
         if (knownCalls.isEmpty()) {
             Timber.tag(loggerTag.value).v("No more call, stop the service")
             stopForegroundCompat()
@@ -262,8 +264,11 @@ class CallAndroidService : VectorAndroidService() {
                 call = call,
                 title = callInformation.opponentMatrixItem?.getBestName() ?: callInformation.opponentUserId
         )
-        // TCHAP fix crash when a call incoming on Androd 14 and higher
-        startForegroundCompat(callId.hashCode(), notification)
+        if (knownCalls.isEmpty()) {
+            startForegroundCompat(callId.hashCode(), notification)
+        } else {
+            notificationManager.notify(callId.hashCode(), notification)
+        }
         knownCalls[callId] = callInformation
     }
 

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
@@ -251,19 +251,17 @@ 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 {
@@ -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
@@ -251,19 +251,17 @@ 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 {
@@ -292,6 +290,7 @@ class VectorCallActivity :
         turnScreenOffAndKeyguardOn()
         removeOnPictureInPictureModeChangedListener(pictureInPictureModeChangedInfoConsumer)
         screenCaptureServiceConnection.unbind()
+        stopMicrophoneService()
         super.onDestroy()
     }