From 936e772ba0189b630cd7a458e4e36f9a9f06de96 Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Tue, 3 Nov 2020 11:00:07 -0400
Subject: [PATCH] Do not set or read quote author phone number.

---
 .../signalservice/api/SignalServiceMessageSender.java       | 5 -----
 .../signalservice/api/messages/SignalServiceContent.java    | 6 +++---
 libsignal/service/src/main/proto/SignalService.proto        | 2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
index 107655c216..dc7525f586 100644
--- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
+++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
@@ -584,11 +584,6 @@ public class SignalServiceMessageSender {
         quoteBuilder.setAuthorUuid(message.getQuote().get().getAuthor().getUuid().get().toString());
       }
 
-      // TODO [Alan] PhoneNumberPrivacy: Do not set this number
-      if (message.getQuote().get().getAuthor().getNumber().isPresent()) {
-        quoteBuilder.setAuthorE164(message.getQuote().get().getAuthor().getNumber().get());
-      }
-
       if (!message.getQuote().get().getMentions().isEmpty()) {
         for (SignalServiceDataMessage.Mention mention : message.getQuote().get().getMentions()) {
           quoteBuilder.addBodyRanges(DataMessage.BodyRange.newBuilder()
diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java
index 507e0e8c90..19f0250033 100644
--- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java
+++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java
@@ -660,8 +660,8 @@ public final class SignalServiceContent {
                                                                           attachment.hasThumbnail() ? createAttachmentPointer(attachment.getThumbnail()) : null));
     }
 
-    if (SignalServiceAddress.isValidAddress(content.getQuote().getAuthorUuid(), content.getQuote().getAuthorE164())) {
-      SignalServiceAddress address = new SignalServiceAddress(UuidUtil.parseOrNull(content.getQuote().getAuthorUuid()), content.getQuote().getAuthorE164());
+    if (SignalServiceAddress.isValidAddress(content.getQuote().getAuthorUuid(), null)) {
+      SignalServiceAddress address = new SignalServiceAddress(UuidUtil.parseOrNull(content.getQuote().getAuthorUuid()), null);
 
       return new SignalServiceDataMessage.Quote(content.getQuote().getId(),
                                                 address,
@@ -669,7 +669,7 @@ public final class SignalServiceContent {
                                                 attachments,
                                                 createMentions(content.getQuote().getBodyRangesList(), content.getQuote().getText(), isGroupV2));
     } else {
-      Log.w(TAG, "Quote was missing an author! Returning null.");
+      Log.w(TAG, "Quote was missing author's UUID! Returning null.");
       return null;
     }
   }
diff --git a/libsignal/service/src/main/proto/SignalService.proto b/libsignal/service/src/main/proto/SignalService.proto
index a52a727008..dfc67e8c93 100644
--- a/libsignal/service/src/main/proto/SignalService.proto
+++ b/libsignal/service/src/main/proto/SignalService.proto
@@ -128,7 +128,7 @@ message DataMessage {
     }
 
     optional uint64           id          = 1;
-    optional string           authorE164  = 2;
+    // optional string           authorE164  = 2;
     optional string           authorUuid  = 5;
     optional string           text        = 3;
     repeated QuotedAttachment attachments = 4;