mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2025-10-10 06:51:49 +02:00
Code Issues Projects Releases Wiki Activity

Fix up merge to develop

Browse Source
This commit is contained in:
J. Ryan Stinnett 2020-06-23 15:24:02 +01:00
parent f3af603102
commit 3829362754
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/structures/auth/SetupEncryptionBody.js
View File

@ -28,6 +28,14 @@ import {
PHASE_FINISHED, PHASE_FINISHED,
} from '../../../stores/SetupEncryptionStore'; } from '../../../stores/SetupEncryptionStore';
function keyHasPassphrase(keyInfo) {
return (
keyInfo.passphrase &&
keyInfo.passphrase.salt &&
keyInfo.passphrase.iterations
);
}
export default class SetupEncryptionBody extends React.Component { export default class SetupEncryptionBody extends React.Component {
static propTypes = { static propTypes = {
onFinished: PropTypes.func.isRequired, onFinished: PropTypes.func.isRequired,

2
src/stores/SetupEncryptionStore.js
View File

@ -36,7 +36,7 @@ export class SetupEncryptionStore extends EventEmitter {
return; return;
} }
this._started = true; this._started = true;
this.phase = PHASE_INTRO; this.phase = PHASE_BUSY;
this.verificationRequest = null; this.verificationRequest = null;
this.backupInfo = null; this.backupInfo = null;