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

Divorce identity wipe from tryAgain functions

Browse source 
We'd like to live in a world where we can retry all the pending
conflicts in a conversation as a batch, which means we don't want to
wipe the identity key before processing each message. Thus, remove that
step from these handlers and encapsulate in a method on the conversation
model.
This commit is contained in:
lilia 2015-02-23 16:23:22 -08:00
parent c642854ddf
commit 857eee5003
5 changed files with 46 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
js/models/conversations.js
View file

@ -190,6 +190,7 @@
return '';
}
},
isPrivate: function() {
return this.get('type') === 'private';
},
@ -218,7 +219,35 @@
this.updateAvatarUrl();
}
return this.avatarUrl || '/images/default.png';
},
resolveConflicts: function() {
if (!this.isPrivate()) {
throw "Can't call resolveConflicts on non-private conversation";
}
if (!this.messageCollection.find(function(m) { return m.getKeyConflict(); })) {
throw "No conflicts to resolve";
}
textsecure.storage.devices.removeIdentityKeyForNumber(this.get('id'));
this.messageCollection.each(function(message) {
var conflict = message.getKeyConflict();
if (conflict) {
new textsecure.ReplayableError(conflict).replay().
then(function(pushMessageContent) {
message.save('errors', []);
if (message.isIncoming()) {
extension.trigger('message:decrypted', {
message_id: message.id,
data: pushMessageContent
});
}
});
}
});
}
});
Whisper.ConversationCollection = Backbone.Collection.extend({