Fix own cross siging trust before verification without key #514

diff --git a/src/app/organisms/emoji-verification/EmojiVerification.jsx b/src/app/organisms/emoji-verification/EmojiVerification.jsx
index 3d63b3c3d4b5a3cfd00e79e01e492f7ec81b59fd..72b936397810a1b123fade58e404c8979efb4404 100644 (file)
--- a/src/app/organisms/emoji-verification/EmojiVerification.jsx
+++ b/src/app/organisms/emoji-verification/EmojiVerification.jsx
@@ -28,12 +28,15 @@ function EmojiVerificationContent({ data, requestClose }) {
   const mountStore = useStore();
 
   const beginVerification = async () => {
-    if (isCrossVerified(mx.deviceId) && !hasPrivateKey(getDefaultSSKey())) {
-      const keyData = await accessSecretStorage('Session verification');
-      if (!keyData) {
-        request.cancel();
-        return;
+    if (mx.getCrossSigningId() === null && isCrossVerified(mx.deviceId)) {
+      if (!hasPrivateKey(getDefaultSSKey())) {
+        const keyData = await accessSecretStorage('Emoji verification');
+        if (!keyData) {
+          request.cancel();
+          return;
+        }
       }
+      await mx.checkOwnCrossSigningTrust();
     }
     setProcess(true);
     await request.accept();