wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get rid of Range lint warnings

Browse source
This commit is contained in:
cketti 2021-11-26 21:38:49 +01:00
parent caf341c187
commit c9be254f0a
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/core/src/main/java/com/fsck/k9/helper/CursorExtensions.kt
View file

@ -23,3 +23,15 @@ fun Cursor.getLongOrNull(columnName: String): Long? {
val columnIndex = getColumnIndex(columnName)
return if (isNull(columnIndex)) null else getLong(columnIndex)
}
fun Cursor.getStringOrThrow(columnName: String): String {
return getStringOrNull(columnName) ?: error("Column $columnName must not be null")
}
fun Cursor.getIntOrThrow(columnName: String): Int {
return getIntOrNull(columnName) ?: error("Column $columnName must not be null")
}
fun Cursor.getLongOrThrow(columnName: String): Long {
return getLongOrNull(columnName) ?: error("Column $columnName must not be null")
}

13
app/core/src/main/java/com/fsck/k9/mailstore/OutboxStateRepository.kt
View file

@ -2,6 +2,10 @@ package com.fsck.k9.mailstore
import android.content.ContentValues
import com.fsck.k9.Clock
import com.fsck.k9.helper.getIntOrThrow
import com.fsck.k9.helper.getLongOrThrow
import com.fsck.k9.helper.getStringOrNull
import com.fsck.k9.helper.getStringOrThrow
class OutboxStateRepository(private val database: LockableDatabase, private val clock: Clock) {
@ -17,11 +21,10 @@ class OutboxStateRepository(private val database: LockableDatabase, private val
throw IllegalStateException("No outbox_state entry for message with id $messageId")
}
val sendStateString = cursor.getString(cursor.getColumnIndex(COLUMN_SEND_STATE))
val numberOfSendAttempts = cursor.getInt(cursor.getColumnIndex(COLUMN_NUMBER_OF_SEND_ATTEMPTS))
val sendErrorTimestamp = cursor.getLong(cursor.getColumnIndex(COLUMN_ERROR_TIMESTAMP))
val sendErrorColumnIndex = cursor.getColumnIndex(COLUMN_ERROR)
val sendError = if (cursor.isNull(sendErrorColumnIndex)) null else cursor.getString(sendErrorColumnIndex)
val sendStateString = cursor.getStringOrThrow(COLUMN_SEND_STATE)
val numberOfSendAttempts = cursor.getIntOrThrow(COLUMN_NUMBER_OF_SEND_ATTEMPTS)
val sendErrorTimestamp = cursor.getLongOrThrow(COLUMN_ERROR_TIMESTAMP)
val sendError = cursor.getStringOrNull(COLUMN_ERROR)
val sendState = SendState.fromDatabaseName(sendStateString)