From bb9c97b96065f1a55f1c5b5ee3801d09b9a1d7b5 Mon Sep 17 00:00:00 2001 From: lilia Date: Thu, 22 Jun 2017 14:42:36 -0700 Subject: [PATCH] Support for receiving null messages 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 --- js/libtextsecure.js | 8 +++++++- libtextsecure/message_receiver.js | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/js/libtextsecure.js b/js/libtextsecure.js index 953602cfc..5a4aff8ca 100644 --- a/js/libtextsecure.js +++ b/js/libtextsecure.js @@ -38444,11 +38444,17 @@ MessageReceiver.prototype.extend({ return this.handleSyncMessage(envelope, content.syncMessage); } else if (content.dataMessage) { return this.handleDataMessage(envelope, content.dataMessage); + } else if (content.nullMessage) { + return this.handleNullMessage(envelope, content.nullMessage); } else { - throw new Error('Got Content message with no dataMessage and no syncMessage'); + throw new Error('Unsupported content message'); } }.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) { if (envelope.source !== this.number) { throw new Error('Received sync message from another number'); diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js index a6af2e227..a6e64258e 100644 --- a/libtextsecure/message_receiver.js +++ b/libtextsecure/message_receiver.js @@ -235,11 +235,17 @@ MessageReceiver.prototype.extend({ return this.handleSyncMessage(envelope, content.syncMessage); } else if (content.dataMessage) { return this.handleDataMessage(envelope, content.dataMessage); + } else if (content.nullMessage) { + return this.handleNullMessage(envelope, content.nullMessage); } else { - throw new Error('Got Content message with no dataMessage and no syncMessage'); + throw new Error('Unsupported content message'); } }.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) { if (envelope.source !== this.number) { throw new Error('Received sync message from another number');