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

Animated loading screens on startup and first conversation load

Browse source 
FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-07-24 18:43:35 -07:00
parent 3e8b34f3d0
commit 53f2bfbb57
15 changed files with 444 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

9
js/models/messages.js
View file

@ -342,7 +342,10 @@
this.send(promise);
}
},
handleDataMessage: function(dataMessage, confirm) {
handleDataMessage: function(dataMessage, confirm, options) {
options = options || {};
_.defaults(options, {initialLoadComplete: true});
// This function can be called from the background script on an
// incoming message or from the frontend after the user accepts an
// identity key change.
@ -357,7 +360,7 @@
console.log('queuing handleDataMessage', message.idForLogging());
var conversation = ConversationController.create({id: conversationId});
conversation.queueJob(function() {
return conversation.queueJob(function() {
return new Promise(function(resolve) {
conversation.fetch().always(function() {
console.log('starting handleDataMessage', message.idForLogging());
@ -500,7 +503,7 @@
// because we need to start expiration timers, etc.
message.markRead();
}
if (message.get('unread')) {
if (message.get('unread') && options.initialLoadComplete) {
conversation.notify(message);
}