mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Ensure that ConversationController.load is resilient to errors

Browse source
This commit is contained in:
Scott Nonnenberg 2020-09-16 15:01:59 -07:00 • committed by Josh Perez
parent b4e9c278d3
commit 67cb10fcae
2 changed files with 43 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

10
js/models/messages.js
View file

@ -1139,6 +1139,7 @@
const stickerData = this.get('sticker'); const stickerData = this.get('sticker');
if (stickerData) { if (stickerData) {
try {
const sticker = Signal.Stickers.getSticker( const sticker = Signal.Stickers.getSticker(
stickerData.packId, stickerData.packId,
stickerData.stickerId stickerData.stickerId
@ -1151,6 +1152,15 @@
text: i18n('message--getNotificationText--stickers'), text: i18n('message--getNotificationText--stickers'),
emoji, emoji,
}; };
} catch (error) {
window.log.error(
'getNotificationData: sticker fetch failed',
error && error.stack ? error.stack : error
);
return {
text: i18n('message--getNotificationText--stickers'),
};
}
} }
if (this.isCallHistory()) { if (this.isCallHistory()) {

7
ts/ConversationController.ts
View file

@ -666,6 +666,7 @@ export class ConversationController {
await Promise.all( await Promise.all(
this._conversations.map(async conversation => { this._conversations.map(async conversation => {
try {
// This call is important to allow Conversation models not to generate their // This call is important to allow Conversation models not to generate their
// cached props on initial construction if we're in the middle of the load // cached props on initial construction if we're in the middle of the load
// from the database. Then we come back to the models when it is safe and // from the database. Then we come back to the models when it is safe and
@ -684,6 +685,12 @@ export class ConversationController {
}); });
updateConversation(conversation.attributes); updateConversation(conversation.attributes);
} }
} catch (error) {
window.log.error(
'ConversationController.load/map: Failed to prepare a conversation',
error && error.stack ? error.stack : error
);
}
}) })
); );
window.log.info('ConversationController: done with initial fetch'); window.log.info('ConversationController: done with initial fetch');