diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt index 4216b2c3..d40ac05d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt @@ -657,6 +657,10 @@ class ThreadActivity : SimpleActivity() { } private fun loadAttachmentPreview(attachmentView: View, uri: Uri) { + if (isDestroyed || isFinishing) { + return + } + val roundedCornersRadius = resources.getDimension(R.dimen.medium_margin).toInt() val options = RequestOptions() .diskCacheStrategy(DiskCacheStrategy.NONE) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt index 135c6eb2..d8adb047 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt @@ -30,7 +30,6 @@ import com.simplemobiletools.commons.views.FastScroller import com.simplemobiletools.commons.views.MyRecyclerView import com.simplemobiletools.smsmessenger.R import com.simplemobiletools.smsmessenger.activities.SimpleActivity -import com.simplemobiletools.smsmessenger.activities.ThreadActivity import com.simplemobiletools.smsmessenger.dialogs.SelectTextDialog import com.simplemobiletools.smsmessenger.extensions.deleteMessage import com.simplemobiletools.smsmessenger.extensions.updateLastConversationMessage @@ -177,13 +176,13 @@ class ThreadAdapter( } private fun deleteMessages() { - if (selectedKeys.isEmpty()) { + val messagesToRemove = getSelectedItems() + if (messagesToRemove.isEmpty()) { return } - val messagesToRemove = getSelectedItems() val positions = getSelectedItemPositions() - val threadId = (messagesToRemove[0] as Message).threadId + val threadId = (messagesToRemove.firstOrNull() as? Message)?.threadId ?: return messagesToRemove.forEach { activity.deleteMessage((it as Message).id, it.isMMS) }