Don't show useless subject

This commit is contained in:
Moez Bhatti
2018-02-28 00:46:23 -05:00
parent fbe74aa316
commit a18ea5e034
2 changed files with 11 additions and 2 deletions
+10 -1
View File
@@ -122,12 +122,21 @@ open class Message : RealmObject() {
.mapNotNull { it.text } .mapNotNull { it.text }
.joinToString("\n") { text -> text } .joinToString("\n") { text -> text }
.takeIf { it.isNotEmpty() } .takeIf { it.isNotEmpty() }
?: subject ?: getCleansedSubject()
.takeIf { it.isNotEmpty() } .takeIf { it.isNotEmpty() }
?: "An MMS message" ?: "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 { fun isSending(): Boolean {
return !isFailedMessage() && isOutgoingMessage() return !isFailedMessage() && isOutgoingMessage()
} }
@@ -135,7 +135,7 @@ class MessagesAdapter @Inject constructor(
} }
RxView.longClicks(view).subscribe { longClicks.onNext(message) } 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.subject.setVisible(view.subject.text.isNotBlank())
view.body.text = message.getText() view.body.text = message.getText()