From c5afeb6d71907f85e430a3b752352cd8f356a7ca Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 14 Jun 2022 15:19:25 -0400
Subject: [PATCH] Update contact photo syncing for linked devices.

---
 .../jobs/MultiDeviceContactUpdateJob.java     | 42 +------------------
 1 file changed, 2 insertions(+), 40 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
index aef5a109ba..6c76df62bb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
@@ -156,7 +156,7 @@ public class MultiDeviceContactUpdateJob extends BaseJob {
 
       out.write(new DeviceContact(RecipientUtil.toSignalServiceAddress(context, recipient),
                                   Optional.ofNullable(recipient.isGroup() || recipient.isSystemContact() ? recipient.getDisplayName(context) : null),
-                                  getAvatar(recipient.getId(), recipient.getContactUri()),
+                                  getSystemAvatar(recipient.getContactUri()),
                                   Optional.of(ChatColorsMapper.getMaterialColor(recipient.getChatColors()).serialize()),
                                   verifiedMessage,
                                   ProfileKeyUtil.profileKeyOptional(recipient.getProfileKey()),
@@ -218,7 +218,7 @@ public class MultiDeviceContactUpdateJob extends BaseJob {
 
         out.write(new DeviceContact(RecipientUtil.toSignalServiceAddress(context, recipient),
                                     name,
-                                    getAvatar(recipient.getId(), recipient.getContactUri()),
+                                    getSystemAvatar(recipient.getContactUri()),
                                     Optional.of(ChatColorsMapper.getMaterialColor(recipient.getChatColors()).serialize()),
                                     verified,
                                     profileKey,
@@ -293,44 +293,6 @@ public class MultiDeviceContactUpdateJob extends BaseJob {
     }
   }
 
-  private Optional<SignalServiceAttachmentStream> getAvatar(@NonNull RecipientId recipientId, @Nullable Uri uri) {
-    Optional<SignalServiceAttachmentStream> stream;
-
-    if (SignalStore.settings().isPreferSystemContactPhotos()) {
-      stream = getSystemAvatar(uri);
-
-      if (!stream.isPresent()) {
-        stream = getProfileAvatar(recipientId);
-      }
-    } else {
-      stream = getProfileAvatar(recipientId);
-
-      if (!stream.isPresent()) {
-        stream = getSystemAvatar(uri);
-      }
-    }
-
-    return stream;
-  }
-
-  private Optional<SignalServiceAttachmentStream> getProfileAvatar(@NonNull RecipientId recipientId) {
-    if (AvatarHelper.hasAvatar(context, recipientId)) {
-      try {
-        long length = AvatarHelper.getAvatarLength(context, recipientId);
-        return Optional.of(SignalServiceAttachmentStream.newStreamBuilder()
-                                                        .withStream(AvatarHelper.getAvatar(context, recipientId))
-                                                        .withContentType("image/*")
-                                                        .withLength(length)
-                                                        .build());
-      } catch (IOException e) {
-        Log.w(TAG, "Failed to read profile avatar!", e);
-        return Optional.empty();
-      }
-    }
-
-    return Optional.empty();
-  }
-
   private Optional<SignalServiceAttachmentStream> getSystemAvatar(@Nullable Uri uri) {
     if (uri == null) {
       return Optional.empty();