Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 09:20:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to reduce impact of thread updates.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-05-01 16:23:59 -04:00
committed by Alex Hart
parent 41935120e5
commit 3c380d35fd
3 changed files with 21 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/main/java/org/thoughtcrime/securesms/conversation/drafts/DraftViewModel.kt
View File

@@ -38,7 +38,7 @@ class DraftViewModel @JvmOverloads constructor(
fun saveEphemeralVoiceNoteDraft(draft: Draft) {
store.update { draftState ->
saveDrafts(draftState.copy(voiceNoteDraft = draft))
saveDraftsIfChanged(draftState, draftState.copy(voiceNoteDraft = draft))
}
}
@@ -49,7 +49,7 @@ class DraftViewModel @JvmOverloads constructor(
fun deleteVoiceNoteDraft() {
store.update {
repository.deleteVoiceNoteDraftData(it.voiceNoteDraft)
saveDrafts(it.copy(voiceNoteDraft = null))
saveDraftsIfChanged(it, it.copy(voiceNoteDraft = null))
}
}
@@ -65,13 +65,13 @@ class DraftViewModel @JvmOverloads constructor(
styleBodyRanges.newBuilder().apply { ranges += mentionRanges.ranges }.build()
}
saveDrafts(it.copy(textDraft = text.toTextDraft(), bodyRangesDraft = bodyRanges?.toDraft(), messageEditDraft = Draft(Draft.MESSAGE_EDIT, messageId.serialize())))
saveDraftsIfChanged(it, it.copy(textDraft = text.toTextDraft(), bodyRangesDraft = bodyRanges?.toDraft(), messageEditDraft = Draft(Draft.MESSAGE_EDIT, messageId.serialize())))
}
}
fun deleteMessageEditDraft() {
store.update {
saveDrafts(it.copy(textDraft = null, bodyRangesDraft = null, messageEditDraft = null))
saveDraftsIfChanged(it, it.copy(textDraft = null, bodyRangesDraft = null, messageEditDraft = null))
}
}
@@ -87,49 +87,53 @@ class DraftViewModel @JvmOverloads constructor(
styleBodyRanges.newBuilder().apply { ranges += mentionRanges.ranges }.build()
}
saveDrafts(it.copy(textDraft = text.toTextDraft(), bodyRangesDraft = bodyRanges?.toDraft()))
saveDraftsIfChanged(it, it.copy(textDraft = text.toTextDraft(), bodyRangesDraft = bodyRanges?.toDraft()))
}
}
fun setLocationDraft(place: SignalPlace) {
store.update {
saveDrafts(it.copy(locationDraft = Draft(Draft.LOCATION, place.serialize() ?: "")))
saveDraftsIfChanged(it, it.copy(locationDraft = Draft(Draft.LOCATION, place.serialize() ?: "")))
}
}
fun clearLocationDraft() {
store.update {
saveDrafts(it.copy(locationDraft = null))
saveDraftsIfChanged(it, it.copy(locationDraft = null))
}
}
fun setQuoteDraft(id: Long, author: RecipientId) {
store.update {
saveDrafts(it.copy(quoteDraft = Draft(Draft.QUOTE, QuoteId(id, author).serialize())))
saveDraftsIfChanged(it, it.copy(quoteDraft = Draft(Draft.QUOTE, QuoteId(id, author).serialize())))
}
}
fun clearQuoteDraft() {
store.update {
saveDrafts(it.copy(quoteDraft = null))
saveDraftsIfChanged(it, it.copy(quoteDraft = null))
}
}
fun onSendComplete(threadId: Long = store.state.threadId) {
repository.deleteVoiceNoteDraftData(store.state.voiceNoteDraft)
store.update { saveDrafts(it.copyAndClearDrafts(threadId)) }
store.update { saveDraftsIfChanged(it, it.copyAndClearDrafts(threadId)) }
}
private fun saveDrafts(state: DraftState): DraftState {
repository.saveDrafts(state.threadId, state.toDrafts())
return state
private fun saveDraftsIfChanged(oldState: DraftState, newState: DraftState): DraftState {
if (oldState == newState) {
return oldState
}
repository.saveDrafts(newState.threadId, newState.toDrafts())
return newState
}
fun loadShareOrDraftData(lastShareDataTimestamp: Long): Maybe<DraftRepository.ShareOrDraftData> {
return repository.getShareOrDraftData(lastShareDataTimestamp)
.doOnSuccess { (_, drafts) ->
if (drafts != null) {
store.update { saveDrafts(it.copyAndSetDrafts(drafts = drafts)) }
store.update { saveDraftsIfChanged(it, it.copyAndSetDrafts(drafts = drafts)) }
}
}
.flatMap { (data, _) ->