App loading screen: show messages processed so far

Also, show the same loading screen on index.js before we've bootstrapped
the app.

FREEBIE

js/background.js

@@ -123,6 +123,7 @@
         messageReceiver.addEventListener('verified', onVerified);
         messageReceiver.addEventListener('error', onError);
         messageReceiver.addEventListener('empty', onEmpty);
+        messageReceiver.addEventListener('progress', onProgress);
 
         window.textsecure.messaging = new textsecure.MessageSender(
             SERVER_URL, SERVER_PORTS, USERNAME, PASSWORD
@@ -158,6 +159,14 @@
             }
         }, 500);
     }
+    function onProgress(ev) {
+        var count = ev.count;
+
+        var view = window.owsDesktopApp.inboxView;
+        if (view) {
+            view.onProgress(count);
+        }
+    }
 
     function onContactReceived(ev) {
         var details = ev.contactDetails;

js/libtextsecure.js

@@ -38245,6 +38245,8 @@ var TextSecureServer = (function() {
  */
 
 function MessageReceiver(url, ports, username, password, signalingKey) {
+    this.count = 0;
+
     this.url = url;
     this.signalingKey = signalingKey;
     this.username = username;
@@ -38357,11 +38359,23 @@ MessageReceiver.prototype.extend({
         }.bind(this);
 
         var scheduleDispatch = function() {
+            // resetting count to zero so everything queued after this starts over again
+            this.count = 0;
+
             this.pending = this.pending.then(dispatchEmpty, dispatchEmpty);
         }.bind(this);
 
         Promise.all(incoming).then(scheduleDispatch, scheduleDispatch);
     },
+    updateProgress: function(count) {
+        // count by 10s
+        if (count % 10 !== 0) {
+            return;
+        }
+        var ev = new Event('progress');
+        ev.count = count;
+        this.dispatchEvent(ev);
+    },
     queueAllCached: function() {
         this.getAllFromCache().then(function(items) {
             for (var i = 0, max = items.length; i < max; i += 1) {
@@ -38446,6 +38460,7 @@ MessageReceiver.prototype.extend({
         return textsecure.storage.unprocessed.remove(id);
     },
     queueDecryptedEnvelope: function(envelope, plaintext) {
+        var count = this.count += 1;
         var id = this.getEnvelopeId(envelope);
         console.log('queueing decrypted envelope', id);
 
@@ -38454,11 +38469,14 @@ MessageReceiver.prototype.extend({
 
         this.pending = this.pending.then(taskWithTimeout, taskWithTimeout);
 
-        return this.pending.catch(function(error) {
+        return this.pending.then(function() {
+            this.updateProgress(count);
+        }.bind(this), function(error) {
             console.log('queueDecryptedEnvelope error handling envelope', id, ':', error && error.stack ? error.stack : error);
         });
     },
     queueEnvelope: function(envelope) {
+        var count = this.count += 1;
         var id = this.getEnvelopeId(envelope);
         console.log('queueing envelope', id);
 
@@ -38467,7 +38485,9 @@ MessageReceiver.prototype.extend({
 
         this.pending = this.pending.then(taskWithTimeout, taskWithTimeout);
 
-        return this.pending.catch(function(error) {
+        return this.pending.then(function() {
+            this.updateProgress(count);
+        }.bind(this), function(error) {
             console.log('queueEnvelope error handling envelope', id, ':', error && error.stack ? error.stack : error);
         });
     },

js/views/conversation_view.js

@@ -59,10 +59,7 @@
 
     Whisper.ConversationLoadingScreen = Whisper.View.extend({
         templateName: 'conversation-loading-screen',
-        className: 'conversation-loading-screen',
-        render_attributes: {
-            loading: i18n('loading')
-        }
+        className: 'conversation-loading-screen'
     });
 
     Whisper.ConversationTitleView = Whisper.View.extend({

js/views/inbox_view.js

@@ -64,8 +64,14 @@
     Whisper.AppLoadingScreen = Whisper.View.extend({
         templateName: 'app-loading-screen',
         className: 'app-loading-screen',
+        updateProgress: function(count) {
+            if (count > 0) {
+                var message = i18n('loadingMessages', count.toString());
+                this.$('.message').text(message);
+            }
+        },
         render_attributes: {
-            loading: i18n('loading')
+            message: i18n('loading')
         }
     });
 
@@ -171,6 +177,12 @@
                 view.remove();
             }
         },
+        onProgress: function(count) {
+            var view = this.appLoadingScreen;
+            if (view) {
+                view.updateProgress(count);
+            }
+        },
         focusConversation: function(e) {
             if (e && this.$(e.target).closest('.placeholder').length) {
                 return;