From d6061fb699d968627a6a028acecbdc251a33811c Mon Sep 17 00:00:00 2001 From: Alan Evans Date: Tue, 2 Feb 2021 15:19:06 -0400 Subject: [PATCH] Fix migration of null titled group. --- .../java/org/thoughtcrime/securesms/groups/GroupManagerV2.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java index c9a95ed19..43adc87fb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java @@ -49,6 +49,7 @@ import org.thoughtcrime.securesms.profiles.AvatarHelper; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.sms.MessageSender; +import org.thoughtcrime.securesms.util.Util; import org.whispersystems.libsignal.util.guava.Optional; import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupUtil; import org.whispersystems.signalservice.api.groupsv2.GroupCandidate; @@ -216,7 +217,7 @@ final class GroupManagerV2 { GroupMasterKey groupMasterKey = groupIdV1.deriveV2MigrationMasterKey(); GroupSecretParams groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey); GroupDatabase.GroupRecord groupRecord = groupDatabase.requireGroup(groupIdV1); - String name = groupRecord.getTitle(); + String name = Util.emptyIfNull(groupRecord.getTitle()); byte[] avatar = groupRecord.hasAvatar() ? AvatarHelper.getAvatarBytes(context, groupRecord.getRecipientId()) : null; int messageTimer = Recipient.resolved(groupRecord.getRecipientId()).getExpireMessages(); Set memberIds = Stream.of(members)