Delay conversation creation til post-decrypt

js/background.js

@@ -53,51 +53,42 @@
             var now = new Date().getTime();
             var timestamp = pushMessage.timestamp.toNumber();
 
-            var conversation = getConversation({
+            var message = new Whisper.Message({
-                id   : pushMessage.source,
+                source         : pushMessage.source,
-                type : 'private'
+                sourceDevice   : pushMessage.sourceDevice,
+                relay          : pushMessage.relay,
+                sent_at        : timestamp,
+                received_at    : now,
+                conversationId : pushMessage.source,
+                type           : 'incoming'
             });
 
-            conversation.fetch().always(function() {
+            var newUnreadCount = storage.get("unreadCount", 0) + 1;
-                var message = conversation.messageCollection.add({
+            storage.put("unreadCount", newUnreadCount);
-                    source         : pushMessage.source,
+            extension.navigator.setBadgeText(newUnreadCount);
-                    sourceDevice   : pushMessage.sourceDevice,
-                    relay          : pushMessage.relay,
-                    sent_at        : timestamp,
-                    received_at    : now,
-                    conversationId : pushMessage.source,
-                    type           : 'incoming'
-                });
-
-                var newUnreadCount = storage.get("unreadCount", 0) + 1;
-                storage.put("unreadCount", newUnreadCount);
-                extension.navigator.setBadgeText(newUnreadCount);
 
-                conversation.save().then(function() {
+            message.save().then(function() {
-                    message.save().then(function() {
+                return new Promise(function(resolve) {
-                        return new Promise(function(resolve) {
+                    resolve(textsecure.protocol_wrapper.handleIncomingPushMessageProto(pushMessage).then(
-                            resolve(textsecure.protocol_wrapper.handleIncomingPushMessageProto(pushMessage).then(
+                        function(pushMessageContent) {
-                                function(pushMessageContent) {
+                            message.handlePushMessageContent(pushMessageContent);
-                                    message.handlePushMessageContent(pushMessageContent);
+                        }
-                                }
+                    ));
-                            ));
+                }).catch(function(e) {
-                        }).catch(function(e) {
+                    if (e.name === 'IncomingIdentityKeyError') {
-                            if (e.name === 'IncomingIdentityKeyError') {
+                        message.save({ errors : [e] }).then(function() {
-                                message.save({ errors : [e] }).then(function() {
+                            extension.trigger('updateInbox');
-                                    extension.trigger('updateInbox');
+                            notifyConversation(message);
-                                    notifyConversation(message);
-                                });
-                            } else if (e.message === 'Bad MAC') {
-                                message.save({ errors : [ _.pick(e, ['name', 'message'])]}).then(function() {
-                                    extension.trigger('updateInbox');
-                                    notifyConversation(message);
-                                });
-                            } else {
-                                console.log(e);
-                                throw e;
-                            }
                         });
-                    });
+                    } else if (e.message === 'Bad MAC') {
+                        message.save({ errors : [ _.pick(e, ['name', 'message'])]}).then(function() {
+                            extension.trigger('updateInbox');
+                            notifyConversation(message);
+                        });
+                    } else {
+                        console.log(e);
+                        throw e;
+                    }
                 });
             });
         }

js/models/messages.js

@@ -17,7 +17,7 @@
     'use strict';
     window.Whisper = window.Whisper || {};
 
-    var Message  = Backbone.Model.extend({
+    var Message  = window.Whisper.Message = Backbone.Model.extend({
         database  : Whisper.Database,
         storeName : 'messages',
         defaults  : function() {