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

Set receivedAt after decrypt, sort by received then sent

Browse source 
FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-08-14 11:23:08 -07:00
parent 4c7b174606
commit 7e9ed1481b
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
js/models/messages.js
View file

@ -589,7 +589,13 @@
model : Message, model : Message,
database : Whisper.Database, database : Whisper.Database,
storeName : 'messages', storeName : 'messages',
comparator : 'received_at', comparator : function(left, right) {
if (left.get('received_at') === right.get('received_at')) {
return (left.get('sent_at') || 0) - (right.get('sent_at') || 0);
}
return (left.get('received_at') || 0) - (right.get('received_at') || 0);
},
initialize : function(models, options) { initialize : function(models, options) {
if (options) { if (options) {
this.conversation = options.conversation; this.conversation = options.conversation;

3
libtextsecure/message_receiver.js
View file

@ -81,7 +81,6 @@ MessageReceiver.prototype.extend({
} }
return; return;
} }
var receivedAt = Date.now();
this.incoming.push(textsecure.crypto.decryptWebsocketMessage(request.body, this.signalingKey).then(function(plaintext) { this.incoming.push(textsecure.crypto.decryptWebsocketMessage(request.body, this.signalingKey).then(function(plaintext) {
var envelope = textsecure.protobuf.Envelope.decode(plaintext); var envelope = textsecure.protobuf.Envelope.decode(plaintext);
@ -93,8 +92,6 @@ MessageReceiver.prototype.extend({
return request.respond(200, 'OK'); return request.respond(200, 'OK');
} }
envelope.receivedAt = receivedAt;
return this.addToCache(envelope, plaintext).then(function() { return this.addToCache(envelope, plaintext).then(function() {
request.respond(200, 'OK'); request.respond(200, 'OK');
this.queueEnvelope(envelope); this.queueEnvelope(envelope);