Skip to content

Commit fb097a3

Browse files
committed
Fix unable to get last sent message id
1 parent e77f661 commit fb097a3

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import dagger.assisted.AssistedFactory
1414
import dagger.assisted.AssistedInject
1515
import dagger.hilt.android.lifecycle.HiltViewModel
1616
import kotlinx.coroutines.Dispatchers
17+
import kotlinx.coroutines.ExperimentalCoroutinesApi
1718
import kotlinx.coroutines.GlobalScope
1819
import kotlinx.coroutines.Job
1920
import kotlinx.coroutines.flow.Flow
@@ -121,6 +122,7 @@ import java.time.ZonedDateTime
121122
import java.util.EnumSet
122123
import java.util.UUID
123124

125+
@OptIn(ExperimentalCoroutinesApi::class)
124126
@HiltViewModel(assistedFactory = ConversationViewModel.Factory::class)
125127
class ConversationViewModel @AssistedInject constructor(
126128
@Assisted val address: Address.Conversable,
@@ -411,7 +413,9 @@ class ConversationViewModel @AssistedInject constructor(
411413
}.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null)
412414

413415
val lastSeenMessageId: Flow<MessageId?>
414-
get() = repository.getLastSentMessageID(threadId)
416+
get() = threadIdFlow.flatMapLatest { id ->
417+
repository.getLastSentMessageID(id ?: return@flatMapLatest flowOf(null))
418+
}
415419

416420
private fun getInputBarState(
417421
recipient: Recipient,

0 commit comments

Comments
 (0)