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
pull/21833/head
J. Ryan Stinnett 2020-09-02 14:29:41 +01:00
parent dd87e9a2f1
commit 4262a99f67
1 changed files with 4 additions and 1 deletions

View File

@ -220,7 +220,10 @@ export default class DeviceListener {
await cli.downloadKeys([cli.getUserId()]); await cli.downloadKeys([cli.getUserId()]);
// cross signing isn't enabled - nag to enable it // cross signing isn't enabled - nag to enable it
// There are 3 different toasts for: // 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) // Cross-signing on account but this device doesn't trust the master key (verify this session)
showSetupEncryptionToast(SetupKind.VERIFY_THIS_SESSION); showSetupEncryptionToast(SetupKind.VERIFY_THIS_SESSION);
} else { } else {