Remove DATACHANNEL flag

evgeny-nadymov · evgeny-nadymov · commit 96b0f6ee971b · 2021-04-23T16:34:53.000+03:00
diff --git a/src/Components/Calls/CallPanel.js b/src/Components/Calls/CallPanel.js
@@ -146,6 +146,11 @@ class CallPanel extends React.Component {
     };
 
     handleClose = () => {
+        if (this.isFullScreen()) {
+            this.exitFullscreen();
+            return;
+        }
+
         this.handleDiscard(null);
     };
 
diff --git a/src/Components/Calls/GroupCallSettings.js b/src/Components/Calls/GroupCallSettings.js
@@ -150,15 +150,16 @@ class GroupCallSettings extends React.Component {
     closeStreams() {
         const { inputAudioStream, inputAudioDeviceId, inputVideoStream, inputVideoDeviceId } = this.state;
         if (inputAudioStream) {
-            if (!CallStore.currentGroupCall || !CallStore.currentCall || inputAudioDeviceId === CallStore.getInputAudioDeviceId()) {
+            if (!CallStore.currentGroupCall && !CallStore.currentCall || inputAudioDeviceId === CallStore.getInputAudioDeviceId()) {
                 inputAudioStream.getAudioTracks().forEach(x => {
                     x.stop();
                 });
             }
         }
+
         if (inputVideoStream) {
-            if (!CallStore.currentGroupCall || !CallStore.currentCall || inputVideoDeviceId === CallStore.getInputVideoDeviceId()) {
-                inputVideoStream.getAudioTracks().forEach(x => {
+            if (!CallStore.currentGroupCall && !CallStore.currentCall || inputVideoDeviceId === CallStore.getInputVideoDeviceId()) {
+                inputVideoStream.getVideoTracks().forEach(x => {
                     x.stop();
                 });
             }
diff --git a/src/Stores/CallStore.js b/src/Stores/CallStore.js
@@ -24,7 +24,6 @@ import P2PEncryptor from '../Calls/P2P/P2PEncryptor';
 const JOIN_TRACKS = true;
 const UNIFY_SDP = true;
 const UNIFY_CANDIDATE = true;
-const DATACHANNEL = true;
 const TG_CALLS = true;
 const TG_CALLS_MEDIA_STATE = true;
 const TG_CALLS_SDP = true;
@@ -1725,32 +1724,28 @@ class CallStore extends EventEmitter {
     }
 
     p2pCreateChannel(connection) {
-        if (DATACHANNEL) {
-            const channel = connection.createDataChannel('data', {
-                id: 0,
-                negotiated: true
-            });
-            channel.onmessage = e => {
-                LOG_P2P_CALL('[channel] onmessage', e);
-                const { data } = e;
-                this.p2pApplyCallDataChannelData(JSON.parse(data));
-            };
-            channel.onopen = () => {
-                const { currentCall } = this;
-                if (!currentCall) return;
-
-                const { callId } = currentCall;
+        const channel = connection.createDataChannel('data', {
+            id: 0,
+            negotiated: true
+        });
+        channel.onmessage = e => {
+            LOG_P2P_CALL('[channel] onmessage', e);
+            const { data } = e;
+            this.p2pApplyCallDataChannelData(JSON.parse(data));
+        };
+        channel.onopen = () => {
+            const { currentCall } = this;
+            if (!currentCall) return;
 
-                const mediaState = this.p2pGetMediaState(callId, 'input');
-                if (!mediaState) return;
+            const { callId } = currentCall;
 
-                this.p2pSendMediaState(callId, mediaState);
-            };
+            const mediaState = this.p2pGetMediaState(callId, 'input');
+            if (!mediaState) return;
 
-            return channel;
-        }
+            this.p2pSendMediaState(callId, mediaState);
+        };
 
-        return null;
+        return channel;
     }
 
     async p2pJoinCall(callId) {
@@ -1933,9 +1928,7 @@ class CallStore extends EventEmitter {
         const { connection } = currentCall;
         if (!connection) return;
 
-        if (DATACHANNEL) {
-            currentCall.channel = this.p2pCreateChannel(connection);
-        }
+        currentCall.channel = this.p2pCreateChannel(connection);
 
         const senders = connection.getSenders();
         if (senders.some(x => x.track)) return;
@@ -2180,11 +2173,7 @@ class CallStore extends EventEmitter {
     p2pSendMediaIsMuted(callId, kind, isMuted) {
         LOG_P2P_CALL('p2pSendMediaIsMuted', callId, kind, isMuted);
 
-        if (DATACHANNEL) {
-            this.p2pSendDataChannelData(JSON.stringify({ type: 'media', kind, isMuted }));
-        } else {
-            this.p2pSendCallSignalingData(callId, JSON.stringify({ type: 'media', kind, isMuted }));
-        }
+        this.p2pSendDataChannelData(JSON.stringify({ type: 'media', kind, isMuted }));
     }
 
     p2pSendMediaState(callId, mediaState) {
