From 2277b41639d30310b7fbdfcfbd35268dd3058701 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Wed, 25 Feb 2015 17:43:04 -0800 Subject: [PATCH] Remove non-existant device messages --- js/libtextsecure.js | 19 ------------------- libtextsecure/axolotl_wrapper.js | 19 ------------------- protos/DeviceMessages.proto | 16 ---------------- protos/IncomingPushMessageSignal.proto | 14 ++++++-------- 4 files changed, 6 insertions(+), 62 deletions(-) diff --git a/js/libtextsecure.js b/js/libtextsecure.js index 5ab0f7f2..4ce8f80e 100644 --- a/js/libtextsecure.js +++ b/js/libtextsecure.js @@ -146,17 +146,6 @@ return finalMessage; } - var decodeDeviceContents = function(res) { - var finalMessage = textsecure.protobuf.DeviceControl.decode(res[0]); - - //TODO: Add END_SESSION flag for device control messages - /*if ((finalMessage.flags & textsecure.protobuf.PushMessageContent.Flags.END_SESSION) - == textsecure.protobuf.PushMessageContent.Flags.END_SESSION) - res[1]();*/ - - return finalMessage; - } - window.textsecure = window.textsecure || {}; window.textsecure.protocol_wrapper = { handleIncomingPushMessageProto: function(proto) { @@ -173,14 +162,6 @@ return axolotl.protocol.handlePreKeyWhisperMessage(from, getString(proto.message)).then(decodeMessageContents); case textsecure.protobuf.IncomingPushMessageSignal.Type.RECEIPT: return Promise.resolve(null); - case textsecure.protobuf.IncomingPushMessageSignal.Type.PREKEY_BUNDLE_DEVICE_CONTROL: - if (proto.message.readUint8() != ((3 << 4) | 3)) - throw new Error("Bad version byte"); - var from = proto.source + "." + (proto.sourceDevice == null ? 0 : proto.sourceDevice); - return axolotl.protocol.handlePreKeyWhisperMessage(from, getString(proto.message)).then(decodeDeviceContents); - case textsecure.protobuf.IncomingPushMessageSignal.Type.DEVICE_CONTROL: - var from = proto.source + "." + (proto.sourceDevice == null ? 0 : proto.sourceDevice); - return axolotl.protocol.decryptWhisperMessage(from, getString(proto.message)).then(decodeDeviceContents); default: return new Promise(function(resolve, reject) { reject(new Error("Unknown message type")); }); } diff --git a/libtextsecure/axolotl_wrapper.js b/libtextsecure/axolotl_wrapper.js index a9f5959d..6d9da8b0 100644 --- a/libtextsecure/axolotl_wrapper.js +++ b/libtextsecure/axolotl_wrapper.js @@ -69,17 +69,6 @@ return finalMessage; } - var decodeDeviceContents = function(res) { - var finalMessage = textsecure.protobuf.DeviceControl.decode(res[0]); - - //TODO: Add END_SESSION flag for device control messages - /*if ((finalMessage.flags & textsecure.protobuf.PushMessageContent.Flags.END_SESSION) - == textsecure.protobuf.PushMessageContent.Flags.END_SESSION) - res[1]();*/ - - return finalMessage; - } - window.textsecure = window.textsecure || {}; window.textsecure.protocol_wrapper = { handleIncomingPushMessageProto: function(proto) { @@ -96,14 +85,6 @@ return axolotl.protocol.handlePreKeyWhisperMessage(from, getString(proto.message)).then(decodeMessageContents); case textsecure.protobuf.IncomingPushMessageSignal.Type.RECEIPT: return Promise.resolve(null); - case textsecure.protobuf.IncomingPushMessageSignal.Type.PREKEY_BUNDLE_DEVICE_CONTROL: - if (proto.message.readUint8() != ((3 << 4) | 3)) - throw new Error("Bad version byte"); - var from = proto.source + "." + (proto.sourceDevice == null ? 0 : proto.sourceDevice); - return axolotl.protocol.handlePreKeyWhisperMessage(from, getString(proto.message)).then(decodeDeviceContents); - case textsecure.protobuf.IncomingPushMessageSignal.Type.DEVICE_CONTROL: - var from = proto.source + "." + (proto.sourceDevice == null ? 0 : proto.sourceDevice); - return axolotl.protocol.decryptWhisperMessage(from, getString(proto.message)).then(decodeDeviceContents); default: return new Promise(function(resolve, reject) { reject(new Error("Unknown message type")); }); } diff --git a/protos/DeviceMessages.proto b/protos/DeviceMessages.proto index ded4cf0f..77717dd6 100644 --- a/protos/DeviceMessages.proto +++ b/protos/DeviceMessages.proto @@ -15,19 +15,3 @@ message ProvisionMessage { optional string number = 3; optional string provisioningCode = 4; } - -message DeviceControl { - enum Type { - UNKNOWN = 0; - NEW_DEVICE_REGISTERED = 1; // Requries only newDeviceId - SENT_MESSAGE = 2; // Requires only message - } - message MessageSent { - required string otherNumber = 1; // The destination account (ie phone #), not device - required uint64 timestamp = 2; - required bytes message = 3; // PushMessageContent - } - required Type type = 1; - optional uint32 newDeviceId = 2; - optional MessageSent message = 3; -} diff --git a/protos/IncomingPushMessageSignal.proto b/protos/IncomingPushMessageSignal.proto index bd5895ff..8ed5f064 100644 --- a/protos/IncomingPushMessageSignal.proto +++ b/protos/IncomingPushMessageSignal.proto @@ -5,14 +5,12 @@ option java_outer_classname = "PushMessageProtos"; message IncomingPushMessageSignal { enum Type { - UNKNOWN = 0; - CIPHERTEXT = 1; - KEY_EXCHANGE = 2; - PREKEY_BUNDLE = 3; - PLAINTEXT = 4; - RECEIPT = 5; - PREKEY_BUNDLE_DEVICE_CONTROL = 6; - DEVICE_CONTROL = 7; + UNKNOWN = 0; + CIPHERTEXT = 1; + KEY_EXCHANGE = 2; + PREKEY_BUNDLE = 3; + PLAINTEXT = 4; + RECEIPT = 5; } optional Type type = 1; optional string source = 2;