diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationViewModel.java index f3e2558ea..6bf73d360 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationViewModel.java @@ -44,12 +44,10 @@ import org.whispersystems.libsignal.util.guava.Optional; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; -import java.util.UUID; public class ConversationViewModel extends ViewModel { @@ -224,7 +222,7 @@ public class ConversationViewModel extends ViewModel { return Transformations.map(groupMembers, members -> { List sorted = Stream.of(members) .filter(member -> !Objects.equals(member, Recipient.self())) - .sortBy(this::getMemberIdentifier) + .sortBy(Recipient::requireStringId) .toList(); List names = ChatColorsPalette.Names.getAll(); @@ -251,13 +249,6 @@ public class ConversationViewModel extends ViewModel { }); } - private @NonNull String getMemberIdentifier(@NonNull Recipient fullMember) { - return fullMember.getUuid() - .transform(UUID::toString) - .or(fullMember.getE164()) - .or(""); - } - long getLastSeen() { return conversationMetadata.getValue() != null ? conversationMetadata.getValue().getLastSeen() : 0; }