mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-10-15 12:32:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure title for notifications are optional. (#721)

Browse source
This commit is contained in:
Justin Bassett 2020-08-09 11:22:27 -04:00 committed by GitHub
parent 09ea80f5d6
commit 4b886b531c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/src/full/java/io/homeassistant/companion/android/notifications/MessagingService.kt
View file

@ -410,8 +410,8 @@ class MessagingService : FirebaseMessagingService() {
builder: NotificationCompat.Builder,
data: Map<String, String>
) {
if (!data[SUBJECT].isNullOrEmpty()) {
builder.setContentText(getSpannedTextFromHtml(data[SUBJECT]))
data[SUBJECT]?.let {
builder.setContentText(getSpannedTextFromHtml(it))
}
}
@ -419,19 +419,18 @@ class MessagingService : FirebaseMessagingService() {
builder: NotificationCompat.Builder,
data: Map<String, String>
) {
builder
.setContentTitle(getSpannedTextFromHtml(data[TITLE]))
.setStyle(
NotificationCompat.BigTextStyle()
.bigText(getSpannedTextFromHtml(data[MESSAGE]))
)
data[TITLE]?.let {
builder.setContentTitle(getSpannedTextFromHtml(it))
}
data[MESSAGE]?.let {
builder.setStyle(NotificationCompat.BigTextStyle().bigText(getSpannedTextFromHtml(it)))
}
}
private fun getSpannedTextFromHtml(
text: String?
text: String
): Spanned {
return HtmlCompat.fromHtml(text ?: "Missing", HtmlCompat.FROM_HTML_MODE_LEGACY)
return HtmlCompat.fromHtml(text, HtmlCompat.FROM_HTML_MODE_LEGACY)
}
private suspend fun handleLargeIcon(