From e3820fd7d393770a8010c7cdde6407c682440b7e Mon Sep 17 00:00:00 2001 From: Aidan Follestad Date: Tue, 8 Jan 2019 16:30:18 -0800 Subject: [PATCH] Show more detail in error notifications --- .../afollestad/nocknock/utilities/providers/IntentProvider.kt | 2 ++ data/src/main/java/com/afollestad/nocknock/data/model/Site.kt | 2 ++ .../nocknock/notifications/NockNotificationManager.kt | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/afollestad/nocknock/utilities/providers/IntentProvider.kt b/common/src/main/java/com/afollestad/nocknock/utilities/providers/IntentProvider.kt index a177c49..773243f 100644 --- a/common/src/main/java/com/afollestad/nocknock/utilities/providers/IntentProvider.kt +++ b/common/src/main/java/com/afollestad/nocknock/utilities/providers/IntentProvider.kt @@ -30,6 +30,8 @@ interface CanNotifyModel : Serializable { fun notifyName(): String fun notifyTag(): String + + fun notifyDescription(): String? } /** @author Aidan Follestad (@afollestad) */ diff --git a/data/src/main/java/com/afollestad/nocknock/data/model/Site.kt b/data/src/main/java/com/afollestad/nocknock/data/model/Site.kt index f271f29..98feedc 100644 --- a/data/src/main/java/com/afollestad/nocknock/data/model/Site.kt +++ b/data/src/main/java/com/afollestad/nocknock/data/model/Site.kt @@ -53,6 +53,8 @@ data class Site( override fun notifyTag(): String = url + override fun notifyDescription() = lastResult?.reason + fun intervalText(): String { requireNotNull(settings) { "Settings not queried." } val lastCheck = lastResult?.timestampMs ?: -1 diff --git a/notifications/src/main/java/com/afollestad/nocknock/notifications/NockNotificationManager.kt b/notifications/src/main/java/com/afollestad/nocknock/notifications/NockNotificationManager.kt index e497151..ba1d2b0 100644 --- a/notifications/src/main/java/com/afollestad/nocknock/notifications/NockNotificationManager.kt +++ b/notifications/src/main/java/com/afollestad/nocknock/notifications/NockNotificationManager.kt @@ -73,7 +73,7 @@ class RealNockNotificationManager( val newNotification = notificationProvider.create( channelId = CheckFailures.id, title = model.notifyName(), - content = stringProvider.get(R.string.something_wrong), + content = model.notifyDescription() ?: stringProvider.get(R.string.something_wrong), intent = intent, smallIcon = R.drawable.ic_notification )