diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt index fd261a00..e9e09e83 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt @@ -48,4 +48,5 @@ data class ComposeState( val canSend: Boolean = false, val validRecipientNumbers: Int = 1, val audioMsgRecording: Boolean = false, + val saveDraft: Boolean = true, ) \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt index 85f494e5..bac02b47 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt @@ -328,6 +328,7 @@ class ComposeViewModel @Inject constructor( view.optionsItemIntent .filter { it == R.id.add } .withLatestFrom(selectedChips) { _, chips -> + newState { copy(saveDraft = false) } // do not save draft on next activity invisibility view.showContacts(sharing, chips) } .autoDisposable(view.scope()) @@ -641,8 +642,10 @@ class ComposeViewModel @Inject constructor( .withLatestFrom(conversation) { _, conversation -> conversation } .mapNotNull { conversation -> conversation.takeIf { it.isValid }?.id } .observeOn(Schedulers.io()) - .withLatestFrom(view.textChangedIntent) { threadId, draft -> - conversationRepo.saveDraft(threadId, draft.toString()) + .withLatestFrom(view.textChangedIntent, state) { threadId, draftText, state -> + if (state.saveDraft) + conversationRepo.saveDraft(threadId, draftText.toString()) + newState { copy(saveDraft = true) } } .autoDisposable(view.scope()) .subscribe()