From 99f115d06bb706801a128c217bf088125df1834c Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 25 Jul 2018 14:34:18 -0400 Subject: [PATCH] Don't log error when finding if we can use subId --- .../main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt | 2 +- data/src/main/java/com/moez/QKSMS/util/SqliteWrapper.kt | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt index 181d9156..bc16c5ca 100644 --- a/data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt @@ -130,7 +130,7 @@ class CursorToMessageImpl @Inject constructor( // column. In this case, we need to check if we do, before trying to sync messages if (!preferences.canUseSubId.isSet) { val canUseSubId = tryOrNull { - SqliteWrapper.query(context, uri, arrayOf(Mms.SUBSCRIPTION_ID))?.use { true } + SqliteWrapper.query(context, uri, arrayOf(Mms.SUBSCRIPTION_ID), logError = false)?.use { true } } preferences.canUseSubId.set(canUseSubId ?: false) diff --git a/data/src/main/java/com/moez/QKSMS/util/SqliteWrapper.kt b/data/src/main/java/com/moez/QKSMS/util/SqliteWrapper.kt index 2a2624f5..6b891d83 100644 --- a/data/src/main/java/com/moez/QKSMS/util/SqliteWrapper.kt +++ b/data/src/main/java/com/moez/QKSMS/util/SqliteWrapper.kt @@ -35,12 +35,15 @@ object SqliteWrapper { projection: Array? = null, selection: String? = null, selectionArgs: Array? = null, - sortOrder: String? = null + sortOrder: String? = null, + logError: Boolean = true ): Cursor? { return try { context.contentResolver.query(uri, projection, selection, selectionArgs, sortOrder) } catch (e: SQLiteException) { - Timber.e(e) + if (logError) { + Timber.e(e) + } null }