Merge branch 'develop' into t3chguy/remove_bluebird

This commit is contained in:
Michael Telatynski 2019-11-20 15:21:23 +00:00 committed by GitHub
commit 6121420113
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
47 changed files with 1838 additions and 245 deletions

View file

@ -126,6 +126,7 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
if (!content || !content['recent_rooms']) {
content = this._getSettings(BREADCRUMBS_LEGACY_EVENT_TYPE);
}
if (!content) content = {}; // If we still don't have content, make some
content['recent_rooms'] = newValue;
return MatrixClientPeg.get().setAccountData(BREADCRUMBS_EVENT_TYPE, content);