colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix second fetchConversation call if unread > 0

Browse Source 
FREEBIE
This commit is contained in:
Scott Nonnenberg
2017-07-27 17:31:15 -07:00
parent 73a77c7b97
commit 4ea457a01c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/models/messages.js
View File

@@ -597,7 +597,7 @@
}, },
getLoadedUnreadCount: function() { getLoadedUnreadCount: function() {
return this.models.reduce(function(total, model) { return this.reduce(function(total, model) {
var unread = model.get('unread') && model.isIncoming(); var unread = model.get('unread') && model.isIncoming();
return total + (unread ? 1 : 0); return total + (unread ? 1 : 0);
}, 0); }, 0);
@@ -637,11 +637,11 @@
this.fetch(options).always(resolve); this.fetch(options).always(resolve);
}.bind(this)).then(function() { }.bind(this)).then(function() {
if (unreadCount > 0) { if (unreadCount > 0) {
if (unreadCount <= startingLoadedUnread) { var loadedUnread = this.getLoadedUnreadCount();
if (loadedUnread >= unreadCount) {
return; return;
} }
var loadedUnread = this.getLoadedUnreadCount();
if (startingLoadedUnread === loadedUnread) { if (startingLoadedUnread === loadedUnread) {
// that fetch didn't get us any more unread. stop fetching more. // that fetch didn't get us any more unread. stop fetching more.
return; return;