From 05c84e498cdf228f62d4a75ea5727263f4e788f4 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 17 Jun 2020 20:28:39 +0200 Subject: [PATCH] catch exceptions thrown at fetching new thread IDs --- .../smsmessenger/extensions/Context.kt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt index efc28f6a..b9808d92 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt @@ -500,7 +500,11 @@ fun Context.markMessageRead(id: Int, isMMS: Boolean) { @SuppressLint("NewApi") fun Context.getThreadId(address: String): Long { return if (isMarshmallowPlus()) { - Threads.getOrCreateThreadId(this, address) + try { + Threads.getOrCreateThreadId(this, address) + } catch (e: Exception) { + 0 + } } else { 0 } @@ -509,7 +513,11 @@ fun Context.getThreadId(address: String): Long { @SuppressLint("NewApi") fun Context.getThreadId(addresses: Set): Long { return if (isMarshmallowPlus()) { - Threads.getOrCreateThreadId(this, addresses) + try { + Threads.getOrCreateThreadId(this, addresses) + } catch (e: Exception) { + 0 + } } else { 0 }