From b24c347cafc6fbb2badeb5fcad61f54f8fa8baf0 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 22 Nov 2016 21:29:59 +0100 Subject: [PATCH] add some Cursor extension functions --- .../notes/databases/DBHelper.kt | 16 +++++++++------- .../simplemobiletools/notes/extensions/Cursor.kt | 7 +++++++ 2 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 app/src/main/kotlin/com/simplemobiletools/notes/extensions/Cursor.kt diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/databases/DBHelper.kt b/app/src/main/kotlin/com/simplemobiletools/notes/databases/DBHelper.kt index df4f30be..10c375e7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/databases/DBHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/databases/DBHelper.kt @@ -9,6 +9,8 @@ import com.simplemobiletools.notes.PREFS_KEY import com.simplemobiletools.notes.R import com.simplemobiletools.notes.TEXT import com.simplemobiletools.notes.TYPE_NOTE +import com.simplemobiletools.notes.extensions.getIntValue +import com.simplemobiletools.notes.extensions.getStringValue import com.simplemobiletools.notes.models.Note import java.util.* @@ -90,10 +92,10 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe cursor = mDb.query(TABLE_NAME, cols, null, null, null, null, "$COL_TITLE COLLATE NOCASE ASC") if (cursor != null && cursor.moveToFirst()) { do { - val id = cursor.getInt(cursor.getColumnIndex(COL_ID)) - val title = cursor.getString(cursor.getColumnIndex(COL_TITLE)) - val value = cursor.getString(cursor.getColumnIndex(COL_VALUE)) - val type = cursor.getInt(cursor.getColumnIndex(COL_TYPE)) + val id = cursor.getIntValue(COL_ID) + val title = cursor.getStringValue(COL_TITLE) + val value = cursor.getStringValue(COL_VALUE) + val type = cursor.getIntValue(COL_TYPE) val note = Note(id, title, value, type) notes.add(note) } while (cursor.moveToNext()) @@ -114,9 +116,9 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe try { cursor = mDb.query(TABLE_NAME, cols, selection, selectionArgs, null, null, null) if (cursor != null && cursor.moveToFirst()) { - val title = cursor.getString(cursor.getColumnIndex(COL_TITLE)) - val value = cursor.getString(cursor.getColumnIndex(COL_VALUE)) - val type = cursor.getInt(cursor.getColumnIndex(COL_TYPE)) + val title = cursor.getStringValue(COL_TITLE) + val value = cursor.getStringValue(COL_VALUE) + val type = cursor.getIntValue(COL_TYPE) note = Note(id, title, value, type) } } finally { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/extensions/Cursor.kt b/app/src/main/kotlin/com/simplemobiletools/notes/extensions/Cursor.kt new file mode 100644 index 00000000..a9581cb2 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/notes/extensions/Cursor.kt @@ -0,0 +1,7 @@ +package com.simplemobiletools.notes.extensions + +import android.database.Cursor + +fun Cursor.getStringValue(key: String) = getString(getColumnIndex(key)) + +fun Cursor.getIntValue(key: String) = getInt(getColumnIndex(key))