Fix crash when smsBody in cursor is null

2018-04-05 04:50:31 -04:00
parent b8deb28813
commit 562137aa77
1 changed files with 5 additions and 1 deletions
@@ -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)
                }