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

Merge pull request #3182 from matrix-org/travis/soft-logout-rehydrate

Browse source 
Ask for the user's password to rehydrate their soft logged out session
This commit is contained in:
Travis Ralston 2019-07-09 11:31:51 -06:00 • committed by GitHub
commit 7b869f2824
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 202 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/structures/MatrixChat.js
View file

@ -450,6 +450,10 @@ export default React.createClass({
startAnyRegistrationFlow(payload);
break;
case 'start_registration':
if (Lifecycle.isSoftLogout()) {
this._onSoftLogout();
break;
}
// This starts the full registration flow
if (payload.screenAfterLogin) {
this._screenAfterLogin = payload.screenAfterLogin;
@ -457,6 +461,10 @@ export default React.createClass({
this._startRegistration(payload.params || {});
break;
case 'start_login':
if (Lifecycle.isSoftLogout()) {
this._onSoftLogout();
break;
}
if (payload.screenAfterLogin) {
this._screenAfterLogin = payload.screenAfterLogin;
}