matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-25 05:23:13 +03:00
Code Activity

Remove unstable support for m.room_key.withheld (#2512)

Browse Source 
We no longer send or receive the unstable type.
This commit is contained in:
Travis Ralston
2022-07-13 08:56:01 -06:00
committed by GitHub
parent aa130c88da
commit 08ab51eeac
4 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spec/integ/megolm-integ.spec.js
View File

@@ -615,9 +615,6 @@ describe("megolm", function() {
).respond(200, { ).respond(200, {
event_id: '$event_id', event_id: '$event_id',
}); });
aliceTestClient.httpBackend.when(
'PUT', '/sendToDevice/org.matrix.room_key.withheld/',
).respond(200, {});
aliceTestClient.httpBackend.when( aliceTestClient.httpBackend.when(
'PUT', '/sendToDevice/m.room_key.withheld/', 'PUT', '/sendToDevice/m.room_key.withheld/',
).respond(200, {}); ).respond(200, {});
@@ -718,9 +715,6 @@ describe("megolm", function() {
event_id: '$event_id', event_id: '$event_id',
}; };
}); });
aliceTestClient.httpBackend.when(
'PUT', '/sendToDevice/org.matrix.room_key.withheld/',
).respond(200, {});
aliceTestClient.httpBackend.when( aliceTestClient.httpBackend.when(
'PUT', '/sendToDevice/m.room_key.withheld/', 'PUT', '/sendToDevice/m.room_key.withheld/',
).respond(200, {}); ).respond(200, {});

4
spec/unit/crypto/algorithms/megolm.spec.js
View File

@@ -643,7 +643,7 @@ describe("MegolmDecryption", function() {
const roomId = "!someroom"; const roomId = "!someroom";
aliceClient.crypto.onToDeviceEvent(new MatrixEvent({ aliceClient.crypto.onToDeviceEvent(new MatrixEvent({
type: "org.matrix.room_key.withheld", type: "m.room_key.withheld",
sender: "@bob:example.com", sender: "@bob:example.com",
content: { content: {
algorithm: "m.megolm.v1.aes-sha2", algorithm: "m.megolm.v1.aes-sha2",
@@ -718,7 +718,7 @@ describe("MegolmDecryption", function() {
const now = Date.now(); const now = Date.now();
aliceClient.crypto.onToDeviceEvent(new MatrixEvent({ aliceClient.crypto.onToDeviceEvent(new MatrixEvent({
type: "org.matrix.room_key.withheld", type: "m.room_key.withheld",
sender: "@bob:example.com", sender: "@bob:example.com",
content: { content: {
algorithm: "m.megolm.v1.aes-sha2", algorithm: "m.megolm.v1.aes-sha2",

1
src/crypto/algorithms/megolm.ts
View File

@@ -738,7 +738,6 @@ class MegolmEncryption extends EncryptionAlgorithm {
contentMap[userId][deviceId] = message; contentMap[userId][deviceId] = message;
} }
await this.baseApis.sendToDevice("org.matrix.room_key.withheld", contentMap);
await this.baseApis.sendToDevice("m.room_key.withheld", contentMap); await this.baseApis.sendToDevice("m.room_key.withheld", contentMap);
// record the fact that we notified these blocked devices // record the fact that we notified these blocked devices

3
src/crypto/index.ts
View File

@@ -3119,8 +3119,7 @@ export class Crypto extends TypedEventEmitter<CryptoEvent, CryptoEventHandlerMap
this.secretStorage.onRequestReceived(event); this.secretStorage.onRequestReceived(event);
} else if (event.getType() === "m.secret.send") { } else if (event.getType() === "m.secret.send") {
this.secretStorage.onSecretReceived(event); this.secretStorage.onSecretReceived(event);
} else if (event.getType() === "m.room_key.withheld" } else if (event.getType() === "m.room_key.withheld") {
|| event.getType() === "org.matrix.room_key.withheld") {
this.onRoomKeyWithheldEvent(event); this.onRoomKeyWithheldEvent(event);
} else if (event.getContent().transaction_id) { } else if (event.getContent().transaction_id) {
this.onKeyVerificationMessage(event); this.onKeyVerificationMessage(event);