From 443f177daac3d510a00f22706d141a56a4d504d1 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 22 May 2020 11:30:54 +1000 Subject: [PATCH] ContentMessage remove auto padding --- .../outgoing/content/ContentMessage.ts | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/ts/session/messages/outgoing/content/ContentMessage.ts b/ts/session/messages/outgoing/content/ContentMessage.ts index 65c978e00..701f0ee9c 100644 --- a/ts/session/messages/outgoing/content/ContentMessage.ts +++ b/ts/session/messages/outgoing/content/ContentMessage.ts @@ -11,9 +11,7 @@ export abstract class ContentMessage implements Message { } public plainTextBuffer(): Uint8Array { - const encoded = SignalService.Content.encode(this.contentProto()).finish(); - - return this.processPlainTextBuffer(encoded); + return SignalService.Content.encode(this.contentProto()).finish(); } public abstract ttl(): number; @@ -28,26 +26,4 @@ export abstract class ContentMessage implements Message { return (window.getMessageTTL() || 24) * 60 * 60 * 1000; } - - private processPlainTextBuffer(buffer: Uint8Array): Uint8Array { - const paddedMessageLength = this.getPaddedMessageLength( - buffer.byteLength + 1 - ); - const plainText = new Uint8Array(paddedMessageLength - 1); - plainText.set(new Uint8Array(buffer)); - plainText[buffer.byteLength] = 0x80; - - return plainText; - } - - private getPaddedMessageLength(length: number): number { - const messageLengthWithTerminator = length + 1; - let messagePartCount = Math.floor(messageLengthWithTerminator / 160); - - if (messageLengthWithTerminator % 160 !== 0) { - messagePartCount += 1; - } - - return messagePartCount * 160; - } }