v9.5.1

Prepare changelog for v9.5.1
Merge pull request #1585 from matrix-org/dbkr/voip-v0-release
2021-01-26 11:39:39 +00:00 · 2021-01-26 11:39:38 +00:00 · 2021-01-26 11:24:07 +00:00 · 2021-01-26 11:17:44 +00:00 · 2021-01-26 11:17:44 +00:00 · 2021-01-26 11:17:44 +00:00
3 changed files with 13 additions and 3 deletions
@@ -1,3 +1,10 @@
+Changes in [9.5.1](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v9.5.1) (2021-01-26)
+================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v9.5.0...v9.5.1)
+
+ * [Release] Fix compatibility with v0 calls
+   [\#1585](https://github.com/matrix-org/matrix-js-sdk/pull/1585)
+
 Changes in [9.5.0](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v9.5.0) (2021-01-18)
 ================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v9.5.0-rc.1...v9.5.0)
@@ -1,6 +1,6 @@
 {
  "name": "matrix-js-sdk",
-  "version": "9.5.0",
+  "version": "9.5.1",
  "description": "Matrix Client-Server SDK for Javascript",
  "scripts": {
    "prepublishOnly": "yarn build",
@@ -271,6 +271,9 @@ export class MatrixCall extends EventEmitter {
        this.type = null;
        this.forceTURN = opts.forceTURN;
        this.ourPartyId = this.client.deviceId;
+        // We compare this to null to checks the presence of a party ID:
+        // make sure it's null, not undefined
+        this.opponentPartyId = null;
        // Array of Objects with urls, username, credential keys
        this.turnServers = opts.turnServers || [];
        if (this.turnServers.length === 0 && this.client.isFallbackICEServerAllowed()) {
@@ -972,7 +975,7 @@ export class MatrixCall extends EventEmitter {
            return;
        }

-        if (this.opponentPartyId !== undefined) {
+        if (this.opponentPartyId !== null) {
            logger.info(
                `Ignoring answer from party ID ${event.getContent().party_id}: ` +
                `we already have an answer/reject from ${this.opponentPartyId}`,
@@ -1336,7 +1339,7 @@ export class MatrixCall extends EventEmitter {

        // party ID must match (our chosen partner hanging up the call) or be undefined (we haven't chosen
        // a partner yet but we're treating the hangup as a reject as per VoIP v0)
-        if (this.partyIdMatches(msg) || this.opponentPartyId === undefined || this.state === CallState.Ringing) {
+        if (this.partyIdMatches(msg) || this.state === CallState.Ringing) {
            // default reason is user_hangup
            this.terminate(CallParty.Remote, msg.reason || CallErrorCode.UserHangup, true);
        } else {
Author	SHA1	Message	Date
RiotRobot	a27ddfaaaf	v9.5.1	2021-01-26 11:39:39 +00:00
RiotRobot	b53f616015	Prepare changelog for v9.5.1	2021-01-26 11:39:38 +00:00
J. Ryan Stinnett	22dc175879	Merge pull request #1585 from matrix-org/dbkr/voip-v0-release [Release] Fix compatibility with v0 calls	2021-01-26 11:24:07 +00:00
David Baker	5f23e4699c	We were using undefined here too	2021-01-26 11:17:44 +00:00
David Baker	a1bd258a7b	Remove unintentional commit	2021-01-26 11:17:44 +00:00
David Baker	39a9c54589	Fix compatability with v0 calls https://github.com/matrix-org/matrix-js-sdk/pull/1567 introduced a bug where we'd leave opponentPartyId undefined, but we compared it to null later when testing for its presence. Fixes https://github.com/vector-im/element-web/issues/16239	2021-01-26 11:17:44 +00:00