From 27a1c9f18a7630b74c4e1957cd29a40bb974add2 Mon Sep 17 00:00:00 2001 From: lilia Date: Tue, 18 Apr 2017 11:44:03 -0700 Subject: [PATCH] Populate attachment file size // FREEBIE --- js/libtextsecure.js | 6 ++++++ js/views/file_input_view.js | 3 ++- libtextsecure/message_receiver.js | 3 +++ libtextsecure/sendmessage.js | 3 +++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/js/libtextsecure.js b/js/libtextsecure.js index 7e0c14a30..40ca8bbb5 100644 --- a/js/libtextsecure.js +++ b/js/libtextsecure.js @@ -38538,6 +38538,9 @@ MessageReceiver.prototype.extend({ handleAttachment: function(attachment) { attachment.id = attachment.id.toString(); attachment.key = attachment.key.toArrayBuffer(); + if (attachment.size) { + attachment.size = attachment.size.toNumber(); + } if (attachment.digest) { attachment.digest = attachment.digest.toArrayBuffer(); } @@ -39052,6 +39055,9 @@ MessageSender.prototype = { if (attachment.fileName) { proto.fileName = attachment.fileName; } + if (attachment.size) { + proto.size = attachment.size; + } return proto; }); }.bind(this)); diff --git a/js/views/file_input_view.js b/js/views/file_input_view.js index cd3bb6a0f..b5397964c 100644 --- a/js/views/file_input_view.js +++ b/js/views/file_input_view.js @@ -229,7 +229,8 @@ resolve({ data: e.target.result, contentType: file.type, - fileName: file.name + fileName: file.name, + size: file.size }); }; FR.onerror = reject; diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js index 771ca9b9a..476efe1b1 100644 --- a/libtextsecure/message_receiver.js +++ b/libtextsecure/message_receiver.js @@ -344,6 +344,9 @@ MessageReceiver.prototype.extend({ handleAttachment: function(attachment) { attachment.id = attachment.id.toString(); attachment.key = attachment.key.toArrayBuffer(); + if (attachment.size) { + attachment.size = attachment.size.toNumber(); + } if (attachment.digest) { attachment.digest = attachment.digest.toArrayBuffer(); } diff --git a/libtextsecure/sendmessage.js b/libtextsecure/sendmessage.js index 683330ec9..956c6b454 100644 --- a/libtextsecure/sendmessage.js +++ b/libtextsecure/sendmessage.js @@ -127,6 +127,9 @@ MessageSender.prototype = { if (attachment.fileName) { proto.fileName = attachment.fileName; } + if (attachment.size) { + proto.size = attachment.size; + } return proto; }); }.bind(this));