matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-29 16:43:09 +03:00
Code Activity

Merge pull request #530 from matrix-org/rav/fix_encrypted_calls

Browse Source 
Handle m.call.* events which are decrypted asynchronously
This commit is contained in:
David Baker
2017-08-24 14:09:12 +01:00
committed by GitHub
parent 201177e7f0 ec5f9a2892
commit ab8f466f53
2 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/client.js
View File

@@ -3053,6 +3053,10 @@ function setupCallEventHandler(client) {
// now loop through the buffer chronologically and inject them
callEventBuffer.forEach(function(e) {
if (ignoreCallIds[e.getContent().call_id]) {
console.log(
'Ignoring previously answered/hungup call ' +
e.getContent().call_id,
);
return;
}
callEventHandler(e);
@@ -3061,20 +3065,25 @@ function setupCallEventHandler(client) {
}
});
client.on("event", function(event) {
if (!isClientPrepared) {
if (event.getType().indexOf("m.call.") === 0) {
callEventBuffer.push(event);
client.on("event", onEvent);
function onEvent(event) {
if (event.getType().indexOf("m.call.") !== 0) {
// not a call event
if (event.isBeingDecrypted() || event.isDecryptionFailure()) {
// not *yet* a call event, but might become one...
event.once("Event.decrypted", onEvent);
}
return;
}
if (!isClientPrepared) {
callEventBuffer.push(event);
return;
}
callEventHandler(event);
});
}
function callEventHandler(event) {
if (event.getType().indexOf("m.call.") !== 0) {
return; // not a call event
}
const content = event.getContent();
let call = content.call_id ? client.callList[content.call_id] : undefined;
let i;

13
src/models/event.js
View File

@@ -318,6 +318,19 @@ utils.extend(module.exports.MatrixEvent.prototype, {
return this._decryptionPromise != null;
},
/**
* Check if this event is an encrypted event which we failed to decrypt
*
* (This implies that we might retry decryption at some point in the future)
*
* @return {boolean} True if this event is an encrypted event which we
* couldn't decrypt.
*/
isDecryptionFailure: function() {
return this._clearEvent && this._clearEvent.content &&
this._clearEvent.content.msgtype === "m.bad.encrypted";
},
/**
* Start the process of trying to decrypt this event.
*