stop screencast when app killed on android

fishjam-dev · Apr 25, 2024 · c8df1a2 · c8df1a2
1 parent 482a07f
commit c8df1a2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/android/src/main/java/com/reactnativemembrane/MembraneWebRTC.kt b/android/src/main/java/com/reactnativemembrane/MembraneWebRTC.kt
@@ -80,7 +80,7 @@ class MembraneWebRTC(val sendEvent: (name: String, data: Map<String, Any?>) -> U
     }
 
     fun onDestroy() {
-        audioSwitchManager?.stop()
+      audioSwitchManager?.stop()
     }
 
     fun onActivityResult(
@@ -225,7 +225,7 @@ class MembraneWebRTC(val sendEvent: (name: String, data: Map<String, Any?>) -> U
     fun disconnect() {
         ensureCreated()
         if (isScreencastOn) {
-            stopScreencast()
+            stopScreencast(false)
         }
         membraneRTC?.disconnect()
         membraneRTC = null
@@ -652,15 +652,18 @@ class MembraneWebRTC(val sendEvent: (name: String, data: Map<String, Any?>) -> U
         emitEndpoints()
     }
 
-    private fun stopScreencast() {
+    private fun stopScreencast(calledFromToggleScreencast: Boolean = true) {
         ensureScreencastTrack()
         localScreencastTrack?.let {
             removeTrackFromLocalEndpoint(it)
             localScreencastTrack = null
         }
 
         setScreencastTrackState(false)
-        screencastPromise?.resolve(isScreencastOn)
+        if(calledFromToggleScreencast){
+          screencastPromise?.resolve(isScreencastOn)
+        }
+
         screencastPromise = null
     }
 

diff --git a/android/src/main/java/com/reactnativemembrane/MembraneWebRTCModule.kt b/android/src/main/java/com/reactnativemembrane/MembraneWebRTCModule.kt
@@ -280,5 +280,9 @@ class MembraneWebRTCModule : Module() {
         OnDestroy {
             membraneWebRTC.onDestroy()
         }
+
+        OnActivityDestroys{
+            membraneWebRTC.disconnect()
+        }
     }
-}
+}