From 394d52307fd0fc385d4aef6ff9e9a0a924611a9f Mon Sep 17 00:00:00 2001
From: Olivier D <odelcroi@gmail.com>
Date: Wed, 18 Jan 2023 15:26:14 +0100
Subject: [PATCH] Remove patch redo-key-sharing-after-own-device-verification
 (#367)

---
 patches/patches.json                            |  6 ------
 .../matrix-js-sdk+21.0.0.patch                  | 17 -----------------
 2 files changed, 23 deletions(-)
 delete mode 100644 patches/redo-key-sharing-after-own-device-verification/matrix-js-sdk+21.0.0.patch

diff --git a/patches/patches.json b/patches/patches.json
index aa12da6cc..3f2069580 100644
--- a/patches/patches.json
+++ b/patches/patches.json
@@ -162,12 +162,6 @@
       "src/PasswordReset.ts"
     ]
   },
-  "redo-key-sharing-after-own-device-verification": {
-    "package": "matrix-js-sdk",
-    "files": [
-      "src/crypto/index.ts"
-    ]
-  },
   "change-keys-in-room-summary-card": {
     "comments" : "add RoomContextMenu and SpacePreferencesDialog under the same patch (same update)",
     "github-issue" : "https://github.com/tchapgouv/tchap-web-v4/issues/365",
diff --git a/patches/redo-key-sharing-after-own-device-verification/matrix-js-sdk+21.0.0.patch b/patches/redo-key-sharing-after-own-device-verification/matrix-js-sdk+21.0.0.patch
deleted file mode 100644
index 4787c997f..000000000
--- a/patches/redo-key-sharing-after-own-device-verification/matrix-js-sdk+21.0.0.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/node_modules/matrix-js-sdk/src/crypto/index.ts b/node_modules/matrix-js-sdk/src/crypto/index.ts
-index 7c0092b..9d0358b 100644
---- a/node_modules/matrix-js-sdk/src/crypto/index.ts
-+++ b/node_modules/matrix-js-sdk/src/crypto/index.ts
-@@ -2269,6 +2269,12 @@ export class Crypto extends TypedEventEmitter<CryptoEvent, CryptoEventHandlerMap
-                 await upload({ shouldEmit: true });
-                 // XXX: we'll need to wait for the device list to be updated
-             }
-+
-+            //:tchap: remove this patch after release of element with
-+            // https://github.com/matrix-org/matrix-js-sdk/pull/2921
-+            // redo key requests after verification
-+            this.cancelAndResendAllOutgoingKeyRequests();
-+            //:tchap: end
-         }
- 
-         const deviceObj = DeviceInfo.fromStorage(dev, deviceId);