From 2b0d3cab40ecb220c9d5bd7bd9641a1e3c03bdc7 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Tue, 2 Aug 2022 09:19:21 -0700
Subject: [PATCH] Remove `source` from Envelope

---
 protos/SignalService.proto               | 1 -
 ts/test-electron/MessageReceiver_test.ts | 2 --
 ts/textsecure/MessageReceiver.ts         | 3 +--
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/protos/SignalService.proto b/protos/SignalService.proto
index 64c5d4363..9daabd2aa 100644
--- a/protos/SignalService.proto
+++ b/protos/SignalService.proto
@@ -23,7 +23,6 @@ message Envelope {
   }
 
   optional Type   type            = 1;
-  optional string source          = 2;
   optional string sourceUuid      = 11;
   optional uint32 sourceDevice    = 7;
   optional string destinationUuid = 13;
diff --git a/ts/test-electron/MessageReceiver_test.ts b/ts/test-electron/MessageReceiver_test.ts
index aee724e37..7fab0f400 100644
--- a/ts/test-electron/MessageReceiver_test.ts
+++ b/ts/test-electron/MessageReceiver_test.ts
@@ -15,7 +15,6 @@ import { SignalService as Proto } from '../protobuf';
 import * as Crypto from '../Crypto';
 
 describe('MessageReceiver', () => {
-  const number = '+19999999999';
   const uuid = 'aaaaaaaa-bbbb-4ccc-9ddd-eeeeeeeeeeee';
   const deviceId = 1;
 
@@ -46,7 +45,6 @@ describe('MessageReceiver', () => {
 
       const body = Proto.Envelope.encode({
         type: Proto.Envelope.Type.CIPHERTEXT,
-        source: number,
         sourceUuid: uuid,
         sourceDevice: deviceId,
         timestamp: Long.fromNumber(Date.now()),
diff --git a/ts/textsecure/MessageReceiver.ts b/ts/textsecure/MessageReceiver.ts
index ceb02cd85..ca538d9ca 100644
--- a/ts/textsecure/MessageReceiver.ts
+++ b/ts/textsecure/MessageReceiver.ts
@@ -357,7 +357,6 @@ export default class MessageReceiver
 
           // Proto.Envelope fields
           type: decoded.type,
-          source: decoded.source,
           sourceUuid: decoded.sourceUuid
             ? normalizeUuid(
                 decoded.sourceUuid,
@@ -757,7 +756,7 @@ export default class MessageReceiver
 
         // Proto.Envelope fields
         type: decoded.type,
-        source: decoded.source || item.source,
+        source: item.source,
         sourceUuid: decoded.sourceUuid
           ? UUID.cast(decoded.sourceUuid)
           : item.sourceUuid,