Fix group call settings

evgeny-nadymov · evgeny-nadymov · commit 84ecea844bd4 · 2021-02-24T23:29:12.000+03:00
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "homepage": "https://evgeny-nadymov.github.io/telegram-react",
   "name": "telegram_react",
-  "version": "0.0.954",
+  "version": "0.0.955",
   "private": true,
   "dependencies": {
     "@arseny30/tdweb": "^1.7.6",
diff --git a/src/Components/Calls/GroupCallSettings.js b/src/Components/Calls/GroupCallSettings.js
@@ -119,6 +119,17 @@ class GroupCallSettings extends React.Component {
         // navigator.permissions.removeEventListener('onchange', this.onDeviceChange);
         KeyboardManager.remove(this.keyboardHandler);
         CallStore.off('updateGroupCall', this.onUpdateGroupCall);
+
+        this.closeStreams();
+    }
+
+    closeStreams() {
+        const { inputAudioStream, inputAudioDeviceId } = this.state;
+        if (inputAudioStream && (!CallStore.currentGroupCall || inputAudioDeviceId === CallStore.getInputAudioDeviceId())) {
+            inputAudioStream.getAudioTracks().forEach(x => {
+                x.stop();
+            });
+        }
     }
 
     onUpdateGroupCall = update => {
@@ -291,28 +302,15 @@ class GroupCallSettings extends React.Component {
         const { onClose } = this.props;
         const { inputAudioDeviceId, inputAudioStream } = this.state;
 
-        if (inputAudioStream) {
-            if (inputAudioDeviceId !== CallStore.getInputAudioDeviceId()) {
-                await CallStore.setInputAudioDeviceId(inputAudioDeviceId, inputAudioStream);
-            } else {
-                inputAudioStream.getAudioTracks().forEach(t => {
-                    t.stop();
-                });
-            }
+        if (inputAudioStream && inputAudioDeviceId !== CallStore.getInputAudioDeviceId()) {
+            await CallStore.setInputAudioDeviceId(inputAudioDeviceId, inputAudioStream);
         }
 
         onClose && onClose();
     };
 
     handleCancel = () => {
         const { onClose } = this.props;
-        const { inputAudioStream } = this.state;
-
-        if (inputAudioStream) {
-            inputAudioStream.getAudioTracks().forEach(x => {
-                x.stop();
-            });
-        }
 
         onClose && onClose();
     };
diff --git a/src/Stores/CallStore.js b/src/Stores/CallStore.js
@@ -100,7 +100,7 @@ class CallStore extends EventEmitter {
                                 break;
                             }
                             case 'callStateReady': {
-                                this.p2p2SendCallSignalingData(id, 'Hello world!');
+                                this.p2pSendCallSignalingData(id, 'Hello world!');
                                 break;
                             }
                         }
@@ -534,6 +534,9 @@ class CallStore extends EventEmitter {
         connection.onsignalingstatechange = event => {
             LOG_CALL('[conn] onsignalingstatechange', connection.signalingState);
         };
+        connection.onconnectionstatechange = event => {
+            LOG_CALL('[conn] onconnectionstatechange', connection.connectionState);
+        };
         connection.onnegotiationneeded = event => {
             LOG_CALL('[conn] onnegotiationneeded', connection.signalingState);
             this.startNegotiation(muted, rejoin);
@@ -1262,8 +1265,8 @@ class CallStore extends EventEmitter {
             '@type': 'callProtocol',
             udp_p2p: true,
             udp_reflector: true,
-            min_layer: 65,
-            max_layer: 65,
+            min_layer: 126,
+            max_layer: 126,
             library_versions: []
         };
     }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"homepage": "https://evgeny-nadymov.github.io/telegram-react",`
`3`	`3`	`"name": "telegram_react",`
`4`		`- "version": "0.0.954",`
	`4`	`+ "version": "0.0.955",`
`5`	`5`	`"private": true,`
`6`	`6`	`"dependencies": {`
`7`	`7`	`"@arseny30/tdweb": "^1.7.6",`