From 033eab5349fd124287d7b01056391822e2cf1d48 Mon Sep 17 00:00:00 2001
From: sashaweiss-signal <sasha@signal.org>
Date: Fri, 6 Sep 2024 10:25:26 -0700
Subject: [PATCH] Drop the displayName field from Contact.Name

---
 rust/message-backup/src/backup/chat/contact_message.rs | 1 -
 rust/message-backup/src/backup/serialize.rs            | 2 --
 rust/message-backup/src/proto/backup.proto             | 1 -
 3 files changed, 4 deletions(-)

diff --git a/rust/message-backup/src/backup/chat/contact_message.rs b/rust/message-backup/src/backup/chat/contact_message.rs
index 83c69a05..46f351c6 100644
--- a/rust/message-backup/src/backup/chat/contact_message.rs
+++ b/rust/message-backup/src/backup/chat/contact_message.rs
@@ -97,7 +97,6 @@ impl TryFrom<proto::ContactAttachment> for ContactAttachment {
             prefix: _,
             suffix: _,
             middleName: _,
-            displayName: _,
             special_fields: _,
         }) = name.as_ref()
         {}
diff --git a/rust/message-backup/src/backup/serialize.rs b/rust/message-backup/src/backup/serialize.rs
index 42374bd8..4a42d3a9 100644
--- a/rust/message-backup/src/backup/serialize.rs
+++ b/rust/message-backup/src/backup/serialize.rs
@@ -246,7 +246,6 @@ impl serde::Serialize for proto::contact_attachment::Name {
             prefix,
             suffix,
             middleName,
-            displayName,
             special_fields: _,
         } = self;
         let mut ser = serializer.serialize_struct("Name", 6)?;
@@ -255,7 +254,6 @@ impl serde::Serialize for proto::contact_attachment::Name {
         ser.serialize_field("prefix", prefix)?;
         ser.serialize_field("suffix", suffix)?;
         ser.serialize_field("middleName", middleName)?;
-        ser.serialize_field("displayName", displayName)?;
         ser.end()
     }
 }
diff --git a/rust/message-backup/src/proto/backup.proto b/rust/message-backup/src/proto/backup.proto
index a777f5f3..b2bc3c7c 100644
--- a/rust/message-backup/src/proto/backup.proto
+++ b/rust/message-backup/src/proto/backup.proto
@@ -475,7 +475,6 @@ message ContactAttachment {
     optional string prefix = 3;
     optional string suffix = 4;
     optional string middleName = 5;
-    optional string displayName = 6;
   }
 
   message Phone {