imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5169 from matrix-org/jryans/defer-cross-signing-setup

Browse source 
Prep work for Settings changes with cross-signing deferral
This commit is contained in:
J. Ryan Stinnett 2020-09-04 12:51:25 +01:00 • committed by GitHub
commit 7b1031d6a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 50 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
View file

@ -21,7 +21,7 @@ import * as sdk from '../../../../index';
import {MatrixClientPeg} from '../../../../MatrixClientPeg';
import { MatrixClient } from 'matrix-js-sdk';
import { _t } from '../../../../languageHandler';
import { accessSecretStorage } from '../../../../CrossSigningManager';
import { accessSecretStorage } from '../../../../SecurityManager';
const RESTORE_TYPE_PASSPHRASE = 0;
const RESTORE_TYPE_RECOVERYKEY = 1;