From 682038399ce722b69ce27f92537d3cd31c52496b Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 24 Feb 2021 16:05:08 -0600 Subject: [PATCH] Use getColumnIndexOrThrow --- app/src/main/java/org/tasks/data/OpenTaskDao.kt | 6 +++--- app/src/main/java/org/tasks/files/FileHelper.kt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/tasks/data/OpenTaskDao.kt b/app/src/main/java/org/tasks/data/OpenTaskDao.kt index 7315cee97..5f232add0 100644 --- a/app/src/main/java/org/tasks/data/OpenTaskDao.kt +++ b/app/src/main/java/org/tasks/data/OpenTaskDao.kt @@ -155,13 +155,13 @@ open class OpenTaskDao @Inject constructor( fun String?.isDecSync(): Boolean = this?.startsWith(ACCOUNT_TYPE_DECSYNC) == true private fun Cursor.getString(columnName: String): String? = - getString(getColumnIndex(columnName)) + getString(getColumnIndexOrThrow(columnName)) private fun Cursor.getInt(columnName: String): Int = - getInt(getColumnIndex(columnName)) + getInt(getColumnIndexOrThrow(columnName)) fun Cursor.getLong(columnName: String): Long = - getLong(getColumnIndex(columnName)) + getLong(getColumnIndexOrThrow(columnName)) fun CaldavCalendar.toLocalCalendar(): CaldavCalendar { val remote = this diff --git a/app/src/main/java/org/tasks/files/FileHelper.kt b/app/src/main/java/org/tasks/files/FileHelper.kt index a9b38cc7c..f74a700e6 100644 --- a/app/src/main/java/org/tasks/files/FileHelper.kt +++ b/app/src/main/java/org/tasks/files/FileHelper.kt @@ -102,7 +102,7 @@ object FileHelper { val cursor = context.contentResolver.query(uri, null, null, null, null) if (cursor != null && cursor.moveToFirst()) { return try { - cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)) + cursor.getString(cursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)) } finally { cursor.close() }