kopia lustrzana https://github.com/ryukoposting/Signal-Android
Fix migration of null titled group.
rodzic
7f2b6178d5
commit
d6061fb699
|
@ -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<RecipientId> memberIds = Stream.of(members)
|
||||
|
|
Ładowanie…
Reference in New Issue