Merge pull request #9467 from wmontwe/fix-db-test-code (52830971) · Commits · e / os / Mail

core/android/common/src/main/kotlin/app/k9mail/core/android/common/database/CursorExtensions.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -11,17 +11,17 @@ fun <T> Cursor.map(block: (Cursor) -> T): List<T> {

		fun Cursor.getStringOrNull(columnName: String): String? {
		val columnIndex = getColumnIndex(columnName)
		return if (isNull(columnIndex)) null else getString(columnIndex)
		return if (columnIndex == -1 \|\| isNull(columnIndex)) null else getString(columnIndex)
		}

		fun Cursor.getIntOrNull(columnName: String): Int? {
		val columnIndex = getColumnIndex(columnName)
		return if (isNull(columnIndex)) null else getInt(columnIndex)
		return if (columnIndex == -1 \|\| isNull(columnIndex)) null else getInt(columnIndex)
		}

		fun Cursor.getLongOrNull(columnName: String): Long? {
		val columnIndex = getColumnIndex(columnName)
		return if (isNull(columnIndex)) null else getLong(columnIndex)
		return if (columnIndex == -1 \|\| isNull(columnIndex)) null else getLong(columnIndex)
		}

		fun Cursor.getStringOrThrow(columnName: String): String {