From 33b817ead8c662efc9bc9097ae12bcfddc4410d3 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 8 Jan 2018 19:31:19 -0500 Subject: [PATCH] Fix parsing and display for text based MMS parts --- .../src/main/java/data/mapper/CursorToPart.kt | 43 +++++++++---------- qksms/src/main/java/data/model/Message.kt | 7 +++ .../feature/compose/MessagesAdapter.kt | 2 +- 3 files changed, 29 insertions(+), 23 deletions(-) diff --git a/qksms/src/main/java/data/mapper/CursorToPart.kt b/qksms/src/main/java/data/mapper/CursorToPart.kt index fb84eab9..9a4b0186 100644 --- a/qksms/src/main/java/data/mapper/CursorToPart.kt +++ b/qksms/src/main/java/data/mapper/CursorToPart.kt @@ -24,30 +24,29 @@ class CursorToPart @Inject constructor(private val context: Context) : Mapper image = getMmsImage(id) - isText() -> text = getMmsText(id) + isImage() -> image = ContentUris.withAppendedId(CONTENT_URI, id).toString() + + isText() -> { + text = if (data == null) { + from.getString(from.getColumnIndexOrThrow("text")) + } else { + val uri = ContentUris.withAppendedId(CONTENT_URI, id) + val sb = StringBuilder() + context.contentResolver.openInputStream(uri)?.use { inputStream -> + val isr = InputStreamReader(inputStream, "UTF-8") + val reader = BufferedReader(isr) + var temp = reader.readLine() + while (temp != null) { + sb.append(temp) + temp = reader.readLine() + } + } + sb.toString() + } + } + else -> Timber.v("Unhandled type: $type") } } - private fun getMmsText(id: Long): String { - val uri = ContentUris.withAppendedId(CONTENT_URI, id) - val sb = StringBuilder() - context.contentResolver.openInputStream(uri)?.use { inputStream -> - val isr = InputStreamReader(inputStream, "UTF-8") - val reader = BufferedReader(isr) - var temp = reader.readLine() - while (temp != null) { - sb.append(temp) - temp = reader.readLine() - } - } - - return sb.toString() - } - - private fun getMmsImage(id: Long): String? { - return ContentUris.withAppendedId(CONTENT_URI, id).toString() - } - } \ No newline at end of file diff --git a/qksms/src/main/java/data/model/Message.kt b/qksms/src/main/java/data/model/Message.kt index 52c0f89c..0555b156 100644 --- a/qksms/src/main/java/data/model/Message.kt +++ b/qksms/src/main/java/data/model/Message.kt @@ -101,6 +101,13 @@ open class Message : RealmObject() { return isOutgoingMms || isOutgoingSms } + fun getText() : String { + return when { + isSms() -> body + else -> parts.filter { it.isText() }.joinToString("") { it.text ?: "" } + } + } + fun isSending(): Boolean { return !isFailedMessage() && isOutgoingMessage() } diff --git a/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt b/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt index 991868af..3ecd39f8 100644 --- a/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt +++ b/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt @@ -131,7 +131,7 @@ class MessagesAdapter @Inject constructor( } view.status?.setVisible(!view.status?.text.isNullOrBlank()) - view.body.text = message.body + view.body.text = message.getText() view.timestamp.text = dateFormatter.getMessageTimestamp(message.date) }