Fix candidate raddr/rport

evgeny-nadymov · evgeny-nadymov · commit 8e99105cdf75 · 2021-04-01T16:10:18.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.973",
+  "version": "0.0.975",
   "private": true,
   "dependencies": {
     "tdweb": "^1.7.2",
diff --git a/src/Calls/P2P/P2PSdpBuilder.js b/src/Calls/P2P/P2PSdpBuilder.js
@@ -35,11 +35,11 @@ export function p2pParseCandidate(candidate) {
                 c.type = other[i + 1];
                 break;
             }
-            case 'rel-addr': {
+            case 'raddr': {
                 c.relAddr = other[i + 1];
                 break;
             }
-            case 'rel-port': {
+            case 'rport': {
                 c.relPort = other[i + 1];
                 break;
             }
@@ -336,10 +336,10 @@ export class P2PSdpBuilder {
             attrs.push(`typ ${type}`);
         }
         if (relAddr) {
-            attrs.push(`rel-addr ${relAddr}`);
+            attrs.push(`raddr ${relAddr}`);
         }
         if (relPort) {
-            attrs.push(`rel-port ${relPort}`);
+            attrs.push(`rport ${relPort}`);
         }
         if (generation) {
             attrs.push(`generation ${generation}`);
diff --git a/src/Components/Calls/CallPanel.js b/src/Components/Calls/CallPanel.js
@@ -22,14 +22,14 @@ import GroupCallSettings from './GroupCallSettings';
 import MenuIcon from '../../Assets/Icons/More';
 import MicIcon from '../../Assets/Icons/Mic';
 import MicOffIcon from '../../Assets/Icons/MicOff';
+import { closeCallPanel } from '../../Actions/Call';
 import { p2pGetCallStatus, p2pIsCallReady } from '../../Calls/Utils';
 import { getUserFullName } from '../../Utils/User';
 import { stopPropagation } from '../../Utils/Message';
 import CallStore from '../../Stores/CallStore';
 import LStore from '../../Stores/LocalizationStore';
 import UserStore from '../../Stores/UserStore';
 import './CallPanel.css';
-import { closeCallPanel } from '../../Actions/Call';
 
 class CallPanel extends React.Component {
     constructor(props) {
@@ -117,7 +117,9 @@ class CallPanel extends React.Component {
     };
 
     handleDiscard = async event => {
-        event.stopPropagation();
+        if (event) {
+            event.stopPropagation();
+        }
 
         const { callId } = this.props;
         if (!callId) return;
@@ -145,9 +147,7 @@ class CallPanel extends React.Component {
     };
 
     handleClose = () => {
-        const { callId } = this.props;
-
-        CallStore.p2pHangUp(callId, true);
+        this.handleDiscard(null);
     };
 
     handleShareScreen = () => {
diff --git a/src/Stores/CallStore.js b/src/Stores/CallStore.js
@@ -21,7 +21,7 @@ import UserStore from './UserStore';
 import TdLibController from '../Controllers/TdLibController';
 
 const JOIN_TRACKS = true;
-const UNIFY_SDP = true;
+const UNIFY_SDP = false;
 const UNIFY_CANDIDATE = true;
 const DATACHANNEL = true;
 

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.973",`
	`4`	`+ "version": "0.0.975",`
`5`	`5`	`"private": true,`
`6`	`6`	`"dependencies": {`
`7`	`7`	`"tdweb": "^1.7.2",`
Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,11 @@ export function p2pParseCandidate(candidate) {`
`35`	`35`	`c.type = other[i + 1];`
`36`	`36`	`break;`
`37`	`37`	`}`
`38`		`- case 'rel-addr': {`
	`38`	`+ case 'raddr': {`
`39`	`39`	`c.relAddr = other[i + 1];`
`40`	`40`	`break;`
`41`	`41`	`}`
`42`		`- case 'rel-port': {`
	`42`	`+ case 'rport': {`
`43`	`43`	`c.relPort = other[i + 1];`
`44`	`44`	`break;`
`45`	`45`	`}`
`@@ -336,10 +336,10 @@ export class P2PSdpBuilder {`
`336`	`336`	attrs.push(`typ ${type}`);
`337`	`337`	`}`
`338`	`338`	`if (relAddr) {`
`339`		- attrs.push(`rel-addr ${relAddr}`);
	`339`	+ attrs.push(`raddr ${relAddr}`);
`340`	`340`	`}`
`341`	`341`	`if (relPort) {`
`342`		- attrs.push(`rel-port ${relPort}`);
	`342`	+ attrs.push(`rport ${relPort}`);
`343`	`343`	`}`
`344`	`344`	`if (generation) {`
`345`	`345`	attrs.push(`generation ${generation}`);