From 4262a99f678feec1194e85c0ef5abc5e7262ea5b Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 2 Sep 2020 14:29:41 +0100 Subject: [PATCH] Tune cross-signing toasts when 4S is missing For the case where cross-signing is trusted on device but secret storage does not exist, we were showing "verify this device", which is not the best match from the existing toasts. This tunes the checks to instead show "set up encryption" which is at least a bit closer. Part of https://github.com/vector-im/element-web/issues/14970 --- src/DeviceListener.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/DeviceListener.ts b/src/DeviceListener.ts index b05f0fcd68..156d8db61b 100644 --- a/src/DeviceListener.ts +++ b/src/DeviceListener.ts @@ -220,7 +220,10 @@ export default class DeviceListener { await cli.downloadKeys([cli.getUserId()]); // cross signing isn't enabled - nag to enable it // There are 3 different toasts for: - if (cli.getStoredCrossSigningForUser(cli.getUserId())) { + if ( + !cli.getCrossSigningId() && + cli.getStoredCrossSigningForUser(cli.getUserId()) + ) { // Cross-signing on account but this device doesn't trust the master key (verify this session) showSetupEncryptionToast(SetupKind.VERIFY_THIS_SESSION); } else {