matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-28 15:22:05 +03:00
Code Activity

Merge branch 'develop' into new-guest-access

Browse Source
This commit is contained in:
Matthew Hodgson
2017-05-28 22:58:18 +01:00
parent fd27d6dab1 e60885eac8
commit 5c885922d9
90 changed files with 5814 additions and 831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Lifecycle.js
View File

@ -27,6 +27,7 @@ import DMRoomMap from './utils/DMRoomMap';
import RtsClient from './RtsClient';
import Modal from './Modal';
import sdk from './index';
import { _t } from './languageHandler';
/**
* Called at startup, to attempt to build a logged-in Matrix session. It tries
@ -237,14 +238,14 @@ function _handleRestoreFailure(e) {
let msg = e.message;
if (msg == "OLM.BAD_LEGACY_ACCOUNT_PICKLE") {
msg = "You need to log back in to generate end-to-end encryption keys "
+ "for this device and submit the public key to your homeserver. "
+ "This is a once off; sorry for the inconvenience.";
msg = _t(
'You need to log back in to generate end-to-end encryption keys for this device and submit the public key to your homeserver. This is a once off; sorry for the inconvenience.'
);
_clearLocalStorage();
return q.reject(new Error(
"Unable to restore previous session: " + msg,
_t('Unable to restore previous session') + ': ' + msg,
));
}