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

Conversation.notify(): introduce a promise to track completion

Browse source 
FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-08-03 18:12:08 -07:00
parent d3fb0e5b46
commit 32e12f7d3c
1 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

34
js/models/conversations.js
View file

@ -815,28 +815,34 @@
notify: function(message) {
if (!message.isIncoming()) {
return;
return Promise.resolve();
}
if (window.isOpen() && window.isFocused()) {
return;
return Promise.resolve();
}
window.drawAttention();
var sender = ConversationController.create({
id: message.get('source'), type: 'private'
});
var conversationId = this.id;
sender.fetch().then(function() {
sender.getNotificationIcon().then(function(iconUrl) {
console.log('adding notification');
Whisper.Notifications.add({
title : sender.getTitle(),
message : message.getNotificationText(),
iconUrl : iconUrl,
imageUrl : message.getImageUrl(),
conversationId : conversationId,
messageId : message.id
});
});
return new Promise(function(resolve, reject) {
sender.fetch().then(function() {
sender.getNotificationIcon().then(function(iconUrl) {
console.log('adding notification');
Whisper.Notifications.add({
title : sender.getTitle(),
message : message.getNotificationText(),
iconUrl : iconUrl,
imageUrl : message.getImageUrl(),
conversationId : conversationId,
messageId : message.id
});
return resolve();
}, reject);
}, reject);
});
},
hashCode: function() {