diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt index 2ad141bd..07860ca2 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt @@ -80,14 +80,18 @@ class ConversationInfoPresenter @Inject constructor( disposables += markUnarchived disposables += deleteConversations - val partsObservable = messageRepo.getPartsForConversation(threadId) - .asObservable() - .filter { parts -> parts.isLoaded && parts.isValid} - disposables += Observables - .combineLatest(conversation, partsObservable) { conversation, parts -> + .combineLatest( + conversation, + messageRepo.getPartsForConversation(threadId).asObservable() + ) { conversation, parts -> val data = mutableListOf() + // If some data was deleted, this isn't the place to handle it + if (!conversation.isLoaded || !conversation.isValid || !parts.isLoaded || !parts.isValid) { + return@combineLatest + } + data += conversation.recipients.map(::ConversationInfoRecipient) data += ConversationInfoItem.ConversationInfoSettings( name = conversation.name,