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

We no longer send or receive the unstable type.
matrix-org · Jul 13, 2022 · 08ab51e · 08ab51e
1 parent aa130c8
commit 08ab51e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/spec/integ/megolm-integ.spec.js b/spec/integ/megolm-integ.spec.js
@@ -615,9 +615,6 @@ describe("megolm", function() {
             ).respond(200, {
                 event_id: '$event_id',
             });
-            aliceTestClient.httpBackend.when(
-                'PUT', '/sendToDevice/org.matrix.room_key.withheld/',
-            ).respond(200, {});
             aliceTestClient.httpBackend.when(
                 'PUT', '/sendToDevice/m.room_key.withheld/',
             ).respond(200, {});
@@ -718,9 +715,6 @@ describe("megolm", function() {
                     event_id: '$event_id',
                 };
             });
-            aliceTestClient.httpBackend.when(
-                'PUT', '/sendToDevice/org.matrix.room_key.withheld/',
-            ).respond(200, {});
             aliceTestClient.httpBackend.when(
                 'PUT', '/sendToDevice/m.room_key.withheld/',
             ).respond(200, {});

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

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

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