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

Add a bit more safety around breadcrumbs

Browse source 
Fixes https://github.com/vector-im/riot-web/issues/11420
This commit is contained in:
Travis Ralston 2019-11-18 14:17:31 -07:00
parent 2f410c060f
commit 8d25952dbb
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/settings/handlers/AccountSettingsHandler.js
View file

@ -126,6 +126,7 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
if (!content || !content['recent_rooms']) { if (!content || !content['recent_rooms']) {
content = this._getSettings(BREADCRUMBS_LEGACY_EVENT_TYPE); content = this._getSettings(BREADCRUMBS_LEGACY_EVENT_TYPE);
} }
if (!content) content = {}; // If we still don't have content, make some
content['recent_rooms'] = newValue; content['recent_rooms'] = newValue;
return MatrixClientPeg.get().setAccountData(BREADCRUMBS_EVENT_TYPE, content); return MatrixClientPeg.get().setAccountData(BREADCRUMBS_EVENT_TYPE, content);
@ -167,7 +168,7 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
// This seems fishy - try and get the event for the new rooms // This seems fishy - try and get the event for the new rooms
const newType = this._getSettings(BREADCRUMBS_EVENT_TYPE); const newType = this._getSettings(BREADCRUMBS_EVENT_TYPE);
if (newType) val = newType['recent_rooms']; if (newType) val = newType['recent_rooms'];
else val = event.getContent()['rooms']; else val = event.getContent()['rooms'] || [];
} else if (event.getType() === BREADCRUMBS_EVENT_TYPE) { } else if (event.getType() === BREADCRUMBS_EVENT_TYPE) {
val = event.getContent()['recent_rooms']; val = event.getContent()['recent_rooms'];
} else { } else {