From 9798f5cc7c5c9b7e393b84b7849824e8a959fe56 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Tue, 17 Jun 2025 14:47:54 -0400 Subject: [PATCH] Fix contact receive desugar crash on Android 6. --- .../thoughtcrime/securesms/contactshare/Contact.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/contactshare/Contact.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/Contact.java index a6efba2f76..128482f429 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contactshare/Contact.java +++ b/app/src/main/java/org/thoughtcrime/securesms/contactshare/Contact.java @@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.util.JsonUtils; import org.thoughtcrime.securesms.util.MediaUtil; import java.io.IOException; -import java.util.Collections; +import java.util.ArrayList; import java.util.List; public class Contact implements Parcelable { @@ -52,10 +52,14 @@ public class Contact implements Parcelable { { this.name = name; this.organization = organization; - this.phoneNumbers = Collections.unmodifiableList(phoneNumbers); - this.emails = Collections.unmodifiableList(emails); - this.postalAddresses = Collections.unmodifiableList(postalAddresses); + this.phoneNumbers = new ArrayList<>(phoneNumbers.size()); + this.emails = new ArrayList<>(emails.size()); + this.postalAddresses = new ArrayList<>(postalAddresses.size()); this.avatar = avatar; + + this.phoneNumbers.addAll(phoneNumbers); + this.emails.addAll(emails); + this.postalAddresses.addAll(postalAddresses); } public Contact(@NonNull Contact contact, @Nullable Avatar avatar) {