call: cleanup connection cleanup

meshenger-app · Jun 5, 2023 · 466aab0 · 466aab0
1 parent a19b259
commit 466aab0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/app/src/main/kotlin/d/d/meshenger/CallActivity.kt b/app/src/main/kotlin/d/d/meshenger/CallActivity.kt
@@ -964,8 +964,6 @@ class CallActivity : BaseActivity(), RTCCall.CallContext {
         Log.d(this, "onDestroy()")
 
         try {
-            currentCall.setCallContext(null)
-
             proximitySensor.stop()
 
             stopRinging()

diff --git a/app/src/main/kotlin/d/d/meshenger/call/RTCCall.kt b/app/src/main/kotlin/d/d/meshenger/call/RTCCall.kt
@@ -745,11 +745,11 @@ class RTCCall : RTCPeerConnection {
         Log.d(this, "cleanup()")
         Utils.checkIsOnMainThread()
 
-        execute {
-            Log.d(this, "cleanup() executor start")
-            setCallContext(null)
-            setStatsCollector(null)
+        Log.d(this, "cleanup() executor start")
+        setCallContext(null)
+        setStatsCollector(null)
 
+        execute {
             try {
                 peerConnection?.close()
             } catch (e: Exception) {