adding some crashfixes

This commit is contained in:
tibbi 2021-03-15 23:30:56 +01:00
parent 6c9d25d16f
commit 0e07117b3a
3 changed files with 15 additions and 6 deletions

View file

@ -156,7 +156,12 @@ class ThreadActivity : SimpleActivity() {
private fun setupCachedMessages(callback: () -> Unit) {
ensureBackgroundThread {
messages = messagesDB.getThreadMessages(threadId).toMutableList() as ArrayList<Message>
messages = try {
messagesDB.getThreadMessages(threadId).toMutableList() as ArrayList<Message>
} catch (e: Exception) {
ArrayList()
}
setupParticipants()
setupAdapter()
@ -176,9 +181,9 @@ class ThreadActivity : SimpleActivity() {
private fun setupThread() {
val privateCursor = getMyContactsCursor()?.loadInBackground()
ensureBackgroundThread {
val cachedMessagesCode = messages.hashCode()
val cachedMessagesCode = messages.clone().hashCode()
messages = getMessages(threadId)
if (messages.hashCode() == cachedMessagesCode && participants.isNotEmpty()) {
if (participants.isNotEmpty() && messages.hashCode() == cachedMessagesCode) {
return@ensureBackgroundThread
}