Move message saving out of helpers.js

js/background.js

@@ -21,6 +21,7 @@ textsecure.registerOnLoadFunction(function() {
 	} else {
 		if (isRegistrationDone()) {
 			textsecure.subscribeToPush(function(message) {
+				Whisper.Messages.addIncomingMessage(message);
 				console.log("Got message from " + message.pushMessage.source + "." + message.pushMessage.sourceDevice +
 							': "' + getString(message.message.body) + '"');
 				var newUnreadCount = storage.getUnencrypted("unreadCount", 0) + 1;

js/helpers.js

@@ -469,13 +469,9 @@ window.textsecure.subscribeToPush = function() {
 						};
 
 						var promises = [];
-						for (var i = 0; i < decrypted.message.attachments.length; i++) {
+						for (var i = 0; i < decrypted.message.attachments.length; i++)
 							promises[i] = handleAttachment(decrypted.message.attachments[i]);
-						}
+						return Promise.all(promises).then(message_callback);
-						return Promise.all(promises).then(function() {
-							Whisper.Messages.addIncomingMessage(decrypted);
-							message_callback(decrypted);
-						});
 					})
 				}).catch(function(e) {
 					console.log("Error handling incoming message: ");