oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity

Ensure that promises always resolve, or that rejections are okay

Browse source
This commit is contained in:
Scott Nonnenberg 2017-07-14 17:05:23 -07:00
parent 4da1722ee8
commit e6859a3684
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
js/models/conversations.js
View file

@ -636,7 +636,9 @@
},
fetchMessages: function() {
if (!this.id) { return false; }
if (!this.id) {
return Promise.reject('This conversation has no id!');
}
return this.messageCollection.fetchConversation(this.id, null, this.get('unreadCount'));
},

3
js/models/messages.js
View file

@ -624,7 +624,7 @@
// SELECT messages WHERE conversationId = this.id ORDER
// received_at DESC
};
this.fetch(options).then(resolve);
this.fetch(options).always(resolve);
}.bind(this)).then(function() {
if (unreadCount > 0) {
if (unreadCount <= startingLoadedUnread) {
@ -637,6 +637,7 @@
return;
}
console.log('fetchConversation: doing another fetch to get all unread');
return this.fetchConversation(conversationId, limit, unreadCount);
}
}.bind(this));

4
js/views/conversation_view.js
View file

@ -474,8 +474,10 @@
});
this.inProgressFetch = null;
}.bind(this));
}.bind(this)).catch(function(error) {
console.log('fetchMessages error:', error && error.stack ? error.stack : error);
this.inProgressFetch = null;
}.bind(this));
// TODO catch?
return this.inProgressFetch;
},