From de54a88b2d36c9f4b60e616a243d14ad31691008 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 23 May 2021 17:01:59 +0200 Subject: [PATCH] catching some exceptions --- .../smsmessenger/activities/ThreadActivity.kt | 7 +++++-- .../smsmessenger/receivers/SmsReceiver.kt | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) 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 c8a686e6..5e601968 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt @@ -188,8 +188,11 @@ class ThreadActivity : SimpleActivity() { it.phoneNumbers.contains(it.name) } - if (participants.isNotEmpty() && messages.hashCode() == cachedMessagesCode && !hasParticipantWithoutName) { - return@ensureBackgroundThread + try { + if (participants.isNotEmpty() && messages.hashCode() == cachedMessagesCode && !hasParticipantWithoutName) { + return@ensureBackgroundThread + } + } catch (ignored: Exception) { } setupParticipants() diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt index e31ac96d..f431cac9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt @@ -40,9 +40,12 @@ class SmsReceiver : BroadcastReceiver() { val newMessageId = context.insertNewSMS(address, subject, body, date, read, threadId, type, subscriptionId) val conversation = context.getConversations(threadId).firstOrNull() ?: return@ensureBackgroundThread - context.conversationsDB.insertOrUpdate(conversation) - context.updateUnreadCountBadge(context.conversationsDB.getUnreadConversations()) + try { + context.conversationsDB.insertOrUpdate(conversation) + } catch (ignored: Exception) { + } + context.updateUnreadCountBadge(context.conversationsDB.getUnreadConversations()) val participant = SimpleContact(0, 0, address, "", arrayListOf(address), ArrayList(), ArrayList()) val participants = arrayListOf(participant) val messageDate = (date / 1000).toInt()