Merge remote-tracking branch 'origin/charlesmchen/mutingVsConnected' into hotfix/2.11.3

8 years ago · 11a3d76ef4
parent fb7a9e39ab e36c3aaed7
commit 11a3d76ef4
1 changed files with 6 additions and 2 deletions
--- a/Signal/src/call/CallService.swift
+++ b/Signal/src/call/CallService.swift
@ -911,8 +911,10 @@ protocol CallServiceObserver: class {
            return
        }

+        if call.state == .connected {
            peerConnectionClient.setAudioEnabled(enabled: !isMuted)
        }
+    }

    /**
     * Local user toggled video.
@ -966,8 +968,10 @@ protocol CallServiceObserver: class {
            return
        }

+        if call.state == .connected {
            peerConnectionClient.setLocalVideoEnabled(enabled: shouldHaveLocalVideoTrack())
        }
+    }

    func handleCallKitStartVideo() {
        AssertIsOnMainThread()