Skip to content

Commit 0e07117

Browse files
committed
adding some crashfixes
1 parent 6c9d25d commit 0e07117

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ android {
5656
}
5757

5858
dependencies {
59-
implementation 'com.simplemobiletools:commons:5.34.21'
59+
implementation 'com.simplemobiletools:commons:5.34.22'
6060
implementation 'org.greenrobot:eventbus:3.2.0'
6161
implementation 'com.klinkerapps:android-smsmms:5.2.6'
6262
implementation 'com.github.tibbi:IndicatorFastScroll:c3de1d040a'

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,12 @@ class ThreadActivity : SimpleActivity() {
156156

157157
private fun setupCachedMessages(callback: () -> Unit) {
158158
ensureBackgroundThread {
159-
messages = messagesDB.getThreadMessages(threadId).toMutableList() as ArrayList<Message>
159+
messages = try {
160+
messagesDB.getThreadMessages(threadId).toMutableList() as ArrayList<Message>
161+
} catch (e: Exception) {
162+
ArrayList()
163+
}
164+
160165
setupParticipants()
161166
setupAdapter()
162167

@@ -176,9 +181,9 @@ class ThreadActivity : SimpleActivity() {
176181
private fun setupThread() {
177182
val privateCursor = getMyContactsCursor()?.loadInBackground()
178183
ensureBackgroundThread {
179-
val cachedMessagesCode = messages.hashCode()
184+
val cachedMessagesCode = messages.clone().hashCode()
180185
messages = getMessages(threadId)
181-
if (messages.hashCode() == cachedMessagesCode && participants.isNotEmpty()) {
186+
if (participants.isNotEmpty() && messages.hashCode() == cachedMessagesCode) {
182187
return@ensureBackgroundThread
183188
}
184189

app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,8 +507,12 @@ fun Context.insertNewSMS(address: String, subject: String, body: String, date: L
507507
put(Sms.SUBSCRIPTION_ID, subscriptionId)
508508
}
509509

510-
val newUri = contentResolver.insert(uri, contentValues)
511-
return newUri?.lastPathSegment?.toLong() ?: 0L
510+
return try {
511+
val newUri = contentResolver.insert(uri, contentValues)
512+
newUri?.lastPathSegment?.toLong() ?: 0L
513+
} catch (e: Exception) {
514+
0L
515+
}
512516
}
513517

514518
fun Context.deleteConversation(threadId: Long) {

0 commit comments

Comments
 (0)