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

Fix thread update with drafts bugs.

Browse source 
* Fix thread not updating correctly when drafts are present.
* Fix thread delete bug during first message drafting.
This commit is contained in:
Cody Henthorne 2022-11-17 11:26:29 -05:00
parent 9ee10512fb
commit dfb913cb98
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/conversation/drafts/DraftRepository.kt
View file

@ -48,8 +48,8 @@ class DraftRepository(
draftDatabase.replaceDrafts(actualThreadId, drafts)
threadDatabase.updateSnippet(actualThreadId, drafts.getSnippet(context), drafts.uriSnippet, System.currentTimeMillis(), MmsSmsColumns.Types.BASE_DRAFT_TYPE, true)
} else if (threadId > 0) {
threadDatabase.update(threadId, false)
draftDatabase.clearDrafts(threadId)
threadDatabase.update(threadId, unarchive = false, allowDeletion = false)
}
}
}

2
app/src/main/java/org/thoughtcrime/securesms/conversation/drafts/DraftViewModel.kt
View file

@ -110,7 +110,7 @@ class DraftViewModel @JvmOverloads constructor(
return repository
.loadDrafts(threadId)
.doOnSuccess { drafts ->
store.update { it.copyAndSetDrafts(threadId, drafts.drafts) }
store.update { saveDrafts(it.copyAndSetDrafts(threadId, drafts.drafts)) }
}
.observeOn(AndroidSchedulers.mainThread())
}

11
app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.kt
View file

@ -1327,6 +1327,17 @@ class ThreadDatabase(context: Context, databaseHelper: SignalDatabase) : Databas
return true
}
val drafts: DraftDatabase.Drafts = SignalDatabase.drafts.getDrafts(threadId)
if (drafts.isNotEmpty()) {
val threadRecord: ThreadRecord? = getThreadRecord(threadId)
if (threadRecord != null &&
threadRecord.type == MmsSmsColumns.Types.BASE_DRAFT_TYPE &&
threadRecord.date > record.timestamp
) {
return false
}
}
updateThread(
threadId = threadId,
meaningfulMessages = meaningfulMessages,