forked from upstream-mirrors/quik
Fix crash when smsBody in cursor is null
This commit is contained in:
@@ -88,7 +88,11 @@ class CursorToMessageImpl @Inject constructor(
|
|||||||
address = cursor.getString(columnsMap.smsAddress) ?: ""
|
address = cursor.getString(columnsMap.smsAddress) ?: ""
|
||||||
boxId = cursor.getInt(columnsMap.smsType)
|
boxId = cursor.getInt(columnsMap.smsType)
|
||||||
seen = cursor.getInt(columnsMap.smsSeen) != 0
|
seen = cursor.getInt(columnsMap.smsSeen) != 0
|
||||||
body = if (columnsMap.smsBody != -1) cursor.getString(columnsMap.smsBody) else null ?: ""
|
|
||||||
|
body = columnsMap.smsBody
|
||||||
|
.takeIf { column -> column != -1 } // The column may not be set
|
||||||
|
?.let { column -> cursor.getString(column) } ?: "" // cursor.getString() may return null
|
||||||
|
|
||||||
errorCode = cursor.getInt(columnsMap.smsErrorCode)
|
errorCode = cursor.getInt(columnsMap.smsErrorCode)
|
||||||
deliveryStatus = cursor.getInt(columnsMap.smsStatus)
|
deliveryStatus = cursor.getInt(columnsMap.smsStatus)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user