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

Support for receiving null messages

Browse source 
Just log em for debugging. Also update the error messge thrown when we get a
content message with no supported properties. It may be empty or may just have
an unrecognized field.

// FREEBIE
This commit is contained in:
lilia 2017-06-22 14:42:36 -07:00 committed by Scott Nonnenberg
parent 243fd68904
commit bb9c97b960
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
js/libtextsecure.js
View file

@ -38444,11 +38444,17 @@ MessageReceiver.prototype.extend({
return this.handleSyncMessage(envelope, content.syncMessage); return this.handleSyncMessage(envelope, content.syncMessage);
} else if (content.dataMessage) { } else if (content.dataMessage) {
return this.handleDataMessage(envelope, content.dataMessage); return this.handleDataMessage(envelope, content.dataMessage);
} else if (content.nullMessage) {
return this.handleNullMessage(envelope, content.nullMessage);
} else { } else {
throw new Error('Got Content message with no dataMessage and no syncMessage'); throw new Error('Unsupported content message');
} }
}.bind(this)); }.bind(this));
}, },
handleNullMessage: function(envelope, nullMessage) {
var encodedNumber = envelope.source + '.' + envelope.sourceDevice;
console.log('null message from', encodedNumber, envelope.timestamp.toNumber());
},
handleSyncMessage: function(envelope, syncMessage) { handleSyncMessage: function(envelope, syncMessage) {
if (envelope.source !== this.number) { if (envelope.source !== this.number) {
throw new Error('Received sync message from another number'); throw new Error('Received sync message from another number');

8
libtextsecure/message_receiver.js
View file

@ -235,11 +235,17 @@ MessageReceiver.prototype.extend({
return this.handleSyncMessage(envelope, content.syncMessage); return this.handleSyncMessage(envelope, content.syncMessage);
} else if (content.dataMessage) { } else if (content.dataMessage) {
return this.handleDataMessage(envelope, content.dataMessage); return this.handleDataMessage(envelope, content.dataMessage);
} else if (content.nullMessage) {
return this.handleNullMessage(envelope, content.nullMessage);
} else { } else {
throw new Error('Got Content message with no dataMessage and no syncMessage'); throw new Error('Unsupported content message');
} }
}.bind(this)); }.bind(this));
}, },
handleNullMessage: function(envelope, nullMessage) {
var encodedNumber = envelope.source + '.' + envelope.sourceDevice;
console.log('null message from', encodedNumber, envelope.timestamp.toNumber());
},
handleSyncMessage: function(envelope, syncMessage) { handleSyncMessage: function(envelope, syncMessage) {
if (envelope.source !== this.number) { if (envelope.source !== this.number) {
throw new Error('Received sync message from another number'); throw new Error('Received sync message from another number');