Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add channel, category and group to notification sensor attributes #2676

Merged
merged 2 commits into from
Jul 22, 2022
Merged

Add channel, category and group to notification sensor attributes #2676

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d889d4
Add channel, category and group to notification sensor attributes
dshokouhi Jul 13, 2022
b1ef31e
Review comments
dshokouhi Jul 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 18 additions & 0 deletions app/src/main/java/io/homeassistant/companion/android/sensors/NotificationSensorManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import android.content.res.Configuration
import android.media.MediaMetadata
import android.media.session.MediaSessionManager
import android.media.session.PlaybackState
import android.os.Build
import android.os.Bundle
import android.service.notification.NotificationListenerService
import android.service.notification.StatusBarNotification
Expand Down Expand Up @@ -138,6 +139,12 @@ class NotificationSensorManager : NotificationListenerService(), SensorManager {
.plus("post_time" to sbn.postTime)
.plus("is_clearable" to sbn.isClearable)
.plus("is_ongoing" to sbn.isOngoing)
.plus("group_id" to sbn.notification.group)
.plus("category" to sbn.notification.category)
.toMutableMap()

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
attr["channel_id"] = sbn.notification.channelId

// Attempt to use the text of the notification but fallback to package name if all else fails.
val state = attr["android.text"] ?: attr["android.title"] ?: sbn.packageName
Expand Down Expand Up @@ -189,6 +196,12 @@ class NotificationSensorManager : NotificationListenerService(), SensorManager {
.plus("post_time" to sbn.postTime)
.plus("is_clearable" to sbn.isClearable)
.plus("is_ongoing" to sbn.isOngoing)
.plus("group_id" to sbn.notification.group)
.plus("category" to sbn.notification.category)
.toMutableMap()

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
attr["channel_id"] = sbn.notification.channelId

// Attempt to use the text of the notification but fallback to package name if all else fails.
val state = attr["android.text"] ?: attr["android.title"] ?: sbn.packageName
Expand Down Expand Up @@ -216,6 +229,11 @@ class NotificationSensorManager : NotificationListenerService(), SensorManager {
.plus(item.packageName + "_" + item.id + "_post_time" to item.postTime)
.plus(item.packageName + "_" + item.id + "_is_ongoing" to item.isOngoing)
.plus(item.packageName + "_" + item.id + "_is_clearable" to item.isClearable)
.plus(item.packageName + "_" + item.id + "_group_id" to item.notification.group)
.plus(item.packageName + "_" + item.id + "_category" to item.notification.category)

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
attr[item.packageName + "_" + item.id + "_channel_id"] = item.notification.channelId
}
onSensorUpdated(
applicationContext,
Expand Down