From 6b2bc924dd4acd1c3151e6d3d77dacb5ffdf5817 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Wed, 1 Apr 2020 13:39:22 -0300
Subject: [PATCH] Prefer profile photo over system contact photo.

---
 .../java/org/thoughtcrime/securesms/recipients/Recipient.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
index 6350dcace9..e09fa8a4f9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
@@ -607,8 +607,8 @@ public class Recipient {
   public @Nullable ContactPhoto getContactPhoto() {
     if      (localNumber)                                    return null;
     else if (isGroupInternal() && groupAvatarId.isPresent()) return new GroupRecordContactPhoto(groupId, groupAvatarId.get());
-    else if (systemContactPhoto != null)                     return new SystemContactPhoto(id, systemContactPhoto, 0);
     else if (profileAvatar != null)                          return new ProfileContactPhoto(this, profileAvatar);
+    else if (systemContactPhoto != null)                     return new SystemContactPhoto(id, systemContactPhoto, 0);
     else                                                     return null;
   }