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

Conversation.markRead: Remove checks for unread

Browse Source 
We will now always attempt to mark things unread if this method. If the
conversation's unreadCount gets out of date, set to zero, we will still
do it. If we go through the motions, and nothing is newly marked read,
we will still set the unreadCount to zero.
This commit is contained in:
Scott Nonnenberg
2017-06-07 12:20:25 -07:00
parent 6fbdd63e7e
commit aeefc530d2
1 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/models/conversations.js
View File

@@ -305,7 +305,6 @@
options = options || {}; options = options || {};
_.defaults(options, {sendReadReceipts: true}); _.defaults(options, {sendReadReceipts: true});
if (this.get('unreadCount') > 0) {
var conversationId = this.id; var conversationId = this.id;
Whisper.Notifications.remove(Whisper.Notifications.where({ Whisper.Notifications.remove(Whisper.Notifications.where({
conversationId: conversationId conversationId: conversationId
@@ -330,17 +329,14 @@
}; };
}.bind(this)); }.bind(this));
if (read.length > 0) {
var unreadCount = unreadMessages.length - read.length; var unreadCount = unreadMessages.length - read.length;
this.save({ unreadCount: unreadCount }); this.save({ unreadCount: unreadCount });
if (options.sendReadReceipts) { if (read.length && options.sendReadReceipts) {
console.log('Sending', read.length, 'read receipts'); console.log('Sending', read.length, 'read receipts');
textsecure.messaging.syncReadMessages(read); textsecure.messaging.syncReadMessages(read);
} }
}
}.bind(this)); }.bind(this));
}
}, },
fetchMessages: function() { fetchMessages: function() {