empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix possible NPE.

Browse source
This commit is contained in:
Alex Hart 2021-10-25 16:30:47 -03:00
parent f0a4956cdd
commit 12565d28ae
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationViewModel.java
View file

@ -188,7 +188,13 @@ public class ConversationViewModel extends ViewModel {
void onMessagesCommitted(@NonNull List<ConversationMessage> conversationMessages) {
if (Util.hasItems(conversationMessages)) {
threadAnimationStateStore.update(state -> {
if (state.getThreadId() == conversationMessages.get(0).getMessageRecord().getThreadId()) {
long threadId = conversationMessages.stream()
.filter(Objects::nonNull)
.findFirst()
.map(c -> c.getMessageRecord().getThreadId())
.orElse(-2L);
if (state.getThreadId() == threadId) {
return state.copy(state.getThreadId(), state.getThreadMetadata(), true);
} else {
return state;