From 647f1f6e09a4d8fa5fb3a11a152a90af8d1248d7 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 11 Jan 2018 14:33:15 -0500 Subject: [PATCH] Provide method to ensure non-empty message text preview for notifications and conversation list --- .../java/common/util/NotificationManager.kt | 2 +- qksms/src/main/java/data/model/Message.kt | 32 +++++++++++++++++-- .../conversations/ConversationsAdapter.kt | 2 +- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/qksms/src/main/java/common/util/NotificationManager.kt b/qksms/src/main/java/common/util/NotificationManager.kt index 9638a3d1..bfadb38b 100644 --- a/qksms/src/main/java/common/util/NotificationManager.kt +++ b/qksms/src/main/java/common/util/NotificationManager.kt @@ -98,7 +98,7 @@ class NotificationManager @Inject constructor( val style = NotificationCompat.MessagingStyle("Me") messages.forEach { message -> val name = if (message.isMe()) null else conversation.getTitle() - style.addMessage(message.body, message.date, name) + style.addMessage(message.getSummary(), message.date, name) } val contentIntent = Intent(context, ComposeActivity::class.java).putExtra("threadId", threadId) diff --git a/qksms/src/main/java/data/model/Message.kt b/qksms/src/main/java/data/model/Message.kt index 160149d3..101a3554 100644 --- a/qksms/src/main/java/data/model/Message.kt +++ b/qksms/src/main/java/data/model/Message.kt @@ -27,7 +27,6 @@ import io.realm.annotations.PrimaryKey open class Message : RealmObject() { - enum class DeliveryStatus { NONE, INFO, FAILED, PENDING, RECEIVED } enum class AttachmentType { TEXT, IMAGE, VIDEO, AUDIO, SLIDESHOW, NOT_LOADED } @PrimaryKey var id: Long = 0 @@ -95,10 +94,37 @@ open class Message : RealmObject() { return isOutgoingMms || isOutgoingSms } - fun getText() : String { + /** + * Returns the text that should be displayed in the messagelist view + * The returned text may be an empty string + */ + fun getText(): String { return when { isSms() -> body - else -> parts.filter { it.isText() }.joinToString("") { it.text ?: "" } + + else -> parts + .mapNotNull { it.text } + .joinToString("\n") { text -> text } + } + } + + /** + * Returns the text that should be displayed when a preview of the message + * needs to be displayed, such as in the conversation view or in a notification + * + * TODO: Don't return a hardcoded string + */ + fun getSummary(): String { + return when { + isSms() -> body + + else -> parts + .mapNotNull { it.text } + .joinToString("\n") { text -> text } + .takeIf { it.isNotEmpty() } + ?: subject + .takeIf { it.isNotEmpty() } + ?: "An MMS message" } } diff --git a/qksms/src/main/java/presentation/feature/conversations/ConversationsAdapter.kt b/qksms/src/main/java/presentation/feature/conversations/ConversationsAdapter.kt index da199209..cc3b332b 100644 --- a/qksms/src/main/java/presentation/feature/conversations/ConversationsAdapter.kt +++ b/qksms/src/main/java/presentation/feature/conversations/ConversationsAdapter.kt @@ -89,7 +89,7 @@ class ConversationsAdapter @Inject constructor( } view.title.text = conversation.getTitle() view.date.text = dateFormatter.getConversationTimestamp(message.date) - view.snippet.text = if (message.isMe()) "You: ${message.getText()}" else message.getText() + view.snippet.text = if (message.isMe()) "You: ${message.getSummary()}" else message.getSummary() } override fun getItemViewType(position: Int): Int {