From 1f9bd55f3b8dfeb426cec63b4eb8f2a6fbc550d0 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 6 Mar 2020 17:37:01 +0100
Subject: [PATCH] revert to legacy user verification (over to_device) without
 xsign keys

---
 src/components/views/right_panel/UserInfo.js | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 17cb80492e..24c5489c4f 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -186,6 +186,16 @@ async function verifyDevice(userId, device) {
     });
 }
 
+async function legacyVerifyUser(member) {
+    const cli = MatrixClientPeg.get();
+    const verificationRequestPromise = cli.requestVerification(member.userId);
+    dis.dispatch({
+        action: "set_right_panel_phase",
+        phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+        refireParams: {member, verificationRequestPromise},
+    });
+}
+
 function verifyUser(user) {
     const cli = MatrixClientPeg.get();
     const dmRoom = findDMForUser(cli, user.userId);
@@ -1355,9 +1365,15 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
     const hasCrossSigningKeys =
         useHasCrossSigningKeys(cli, member, canVerify, setUpdating );
 
-    if (canVerify && hasCrossSigningKeys) {
+    if (canVerify) {
         verifyButton = (
-            <AccessibleButton className="mx_UserInfo_field" onClick={() => verifyUser(member)}>
+            <AccessibleButton className="mx_UserInfo_field" onClick={() => {
+                if (hasCrossSigningKeys) {
+                    verifyUser(member);
+                } else {
+                    legacyVerifyUser(member);
+                }
+            }}>
                 {_t("Verify")}
             </AccessibleButton>
         );