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

Delay conversation creation til post-decrypt

Browse source
This commit is contained in:
lilia 2015-05-20 15:52:25 -07:00
parent 12eb553a3f
commit b83ce7a015
2 changed files with 33 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

11
js/background.js
View file

@ -53,13 +53,7 @@
var now = new Date().getTime();
var timestamp = pushMessage.timestamp.toNumber();
var conversation = getConversation({
id : pushMessage.source,
type : 'private'
});
conversation.fetch().always(function() {
var message = conversation.messageCollection.add({
var message = new Whisper.Message({
source : pushMessage.source,
sourceDevice : pushMessage.sourceDevice,
relay : pushMessage.relay,
@ -73,7 +67,6 @@
storage.put("unreadCount", newUnreadCount);
extension.navigator.setBadgeText(newUnreadCount);
conversation.save().then(function() {
message.save().then(function() {
return new Promise(function(resolve) {
resolve(textsecure.protocol_wrapper.handleIncomingPushMessageProto(pushMessage).then(
@ -98,8 +91,6 @@
}
});
});
});
});
}
// lazy hack

2
js/models/messages.js
View file

@ -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() {