mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Utilize built in string id getter instead of using our own logic for name colors.

fork-5.53.8
Alex Hart 2021-06-04 10:39:38 -03:00
rodzic b8f1b98c74
commit be3e89ac20
1 zmienionych plików z 1 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationViewModel.java
Wyświetl plik

@ -44,12 +44,10 @@ import org.whispersystems.libsignal.util.guava.Optional;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.UUID;
public class ConversationViewModel extends ViewModel { public class ConversationViewModel extends ViewModel {
@ -224,7 +222,7 @@ public class ConversationViewModel extends ViewModel {
return Transformations.map(groupMembers, members -> { return Transformations.map(groupMembers, members -> {
List<Recipient> sorted = Stream.of(members) List<Recipient> sorted = Stream.of(members)
.filter(member -> !Objects.equals(member, Recipient.self())) .filter(member -> !Objects.equals(member, Recipient.self()))
.sortBy(this::getMemberIdentifier) .sortBy(Recipient::requireStringId)
.toList(); .toList();
List<NameColor> names = ChatColorsPalette.Names.getAll(); List<NameColor> 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() { long getLastSeen() {
return conversationMetadata.getValue() != null ? conversationMetadata.getValue().getLastSeen() : 0; return conversationMetadata.getValue() != null ? conversationMetadata.getValue().getLastSeen() : 0;
} }