From 562137aa779ec4cefeb4d7ba29cc0e50eef28ba5 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 5 Apr 2018 04:50:31 -0400 Subject: [PATCH] Fix crash when smsBody in cursor is null --- data/src/main/java/mapper/CursorToMessageImpl.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/src/main/java/mapper/CursorToMessageImpl.kt b/data/src/main/java/mapper/CursorToMessageImpl.kt index 5a5bdd55..48193d74 100644 --- a/data/src/main/java/mapper/CursorToMessageImpl.kt +++ b/data/src/main/java/mapper/CursorToMessageImpl.kt @@ -88,7 +88,11 @@ class CursorToMessageImpl @Inject constructor( address = cursor.getString(columnsMap.smsAddress) ?: "" boxId = cursor.getInt(columnsMap.smsType) 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) deliveryStatus = cursor.getInt(columnsMap.smsStatus) }