diff --git a/qksms/src/main/java/data/model/Message.kt b/qksms/src/main/java/data/model/Message.kt index a40a3237..13f45bc7 100644 --- a/qksms/src/main/java/data/model/Message.kt +++ b/qksms/src/main/java/data/model/Message.kt @@ -122,12 +122,21 @@ open class Message : RealmObject() { .mapNotNull { it.text } .joinToString("\n") { text -> text } .takeIf { it.isNotEmpty() } - ?: subject + ?: getCleansedSubject() .takeIf { it.isNotEmpty() } ?: "An MMS message" } } + /** + * Cleanses the subject in case it's useless, so that the UI doesn't have to show it + */ + fun getCleansedSubject(): String { + val uselessSubjects = listOf("no subject") + + return if (uselessSubjects.contains(subject)) "" else subject + } + 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 7222db97..e6643fc5 100644 --- a/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt +++ b/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt @@ -135,7 +135,7 @@ class MessagesAdapter @Inject constructor( } RxView.longClicks(view).subscribe { longClicks.onNext(message) } - view.subject.text = message.subject + view.subject.text = message.getCleansedSubject() view.subject.setVisible(view.subject.text.isNotBlank()) view.body.text = message.getText()