Skip to content

Commit 18026c4

Browse files
committed
adding some crashfixes
1 parent 8e843ee commit 18026c4

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,10 @@ class ThreadActivity : SimpleActivity() {
657657
}
658658

659659
private fun loadAttachmentPreview(attachmentView: View, uri: Uri) {
660+
if (isDestroyed || isFinishing) {
661+
return
662+
}
663+
660664
val roundedCornersRadius = resources.getDimension(R.dimen.medium_margin).toInt()
661665
val options = RequestOptions()
662666
.diskCacheStrategy(DiskCacheStrategy.NONE)

app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import com.simplemobiletools.commons.views.FastScroller
3030
import com.simplemobiletools.commons.views.MyRecyclerView
3131
import com.simplemobiletools.smsmessenger.R
3232
import com.simplemobiletools.smsmessenger.activities.SimpleActivity
33-
import com.simplemobiletools.smsmessenger.activities.ThreadActivity
3433
import com.simplemobiletools.smsmessenger.dialogs.SelectTextDialog
3534
import com.simplemobiletools.smsmessenger.extensions.deleteMessage
3635
import com.simplemobiletools.smsmessenger.extensions.updateLastConversationMessage
@@ -177,13 +176,13 @@ class ThreadAdapter(
177176
}
178177

179178
private fun deleteMessages() {
180-
if (selectedKeys.isEmpty()) {
179+
val messagesToRemove = getSelectedItems()
180+
if (messagesToRemove.isEmpty()) {
181181
return
182182
}
183183

184-
val messagesToRemove = getSelectedItems()
185184
val positions = getSelectedItemPositions()
186-
val threadId = (messagesToRemove[0] as Message).threadId
185+
val threadId = (messagesToRemove.firstOrNull() as? Message)?.threadId ?: return
187186
messagesToRemove.forEach {
188187
activity.deleteMessage((it as Message).id, it.isMMS)
189188
}

0 commit comments

Comments
 (0)