From 17c0364eda0bc8eb48029934b4e69501034ea6e7 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 3 Aug 2020 14:41:49 -0400
Subject: [PATCH] Ensure group avatars have V2 attachmentIds.

---
 .../securesms/groups/GroupV1MessageProcessor.java            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupV1MessageProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupV1MessageProcessor.java
index 253ff767d..39e66af32 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupV1MessageProcessor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupV1MessageProcessor.java
@@ -273,7 +273,10 @@ public final class GroupV1MessageProcessor {
     GroupContext.Builder builder = GroupContext.newBuilder();
     builder.setId(ByteString.copyFrom(group.getGroupId()));
 
-    if (group.getAvatar().isPresent() && group.getAvatar().get().isPointer()) {
+    if (group.getAvatar().isPresent()       &&
+        group.getAvatar().get().isPointer() &&
+        group.getAvatar().get().asPointer().getRemoteId().getV2().isPresent())
+    {
       builder.setAvatar(AttachmentPointer.newBuilder()
                                          .setCdnId(group.getAvatar().get().asPointer().getRemoteId().getV2().get())
                                          .setKey(ByteString.copyFrom(group.getAvatar().get().asPointer().getKey()))