From a04c1790eccae369c276344ccb63fd5eeeef4a14 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Sun, 24 Apr 2022 19:59:37 -0400
Subject: [PATCH] Do not group sticky notification with others, #219

---
 app/src/main/java/io/heckel/ntfy/service/SubscriberService.kt | 2 ++
 fastlane/metadata/android/en-US/changelog/26.txt              | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/heckel/ntfy/service/SubscriberService.kt b/app/src/main/java/io/heckel/ntfy/service/SubscriberService.kt
index 42aea96..09d745d 100644
--- a/app/src/main/java/io/heckel/ntfy/service/SubscriberService.kt
+++ b/app/src/main/java/io/heckel/ntfy/service/SubscriberService.kt
@@ -299,6 +299,7 @@ class SubscriberService : Service() {
             .setContentIntent(pendingIntent)
             .setSound(null)
             .setShowWhen(false) // Don't show date/time
+            .setGroup(NOTIFICATION_GROUP_ID) // Do not group with other notifications
             .build()
     }
 
@@ -353,6 +354,7 @@ class SubscriberService : Service() {
 
         private const val WAKE_LOCK_TAG = "SubscriberService:lock"
         private const val NOTIFICATION_CHANNEL_ID = "ntfy-subscriber"
+        private const val NOTIFICATION_GROUP_ID = "io.heckel.ntfy.NOTIFICATION_GROUP_SERVICE"
         private const val NOTIFICATION_SERVICE_ID = 2586
         private const val NOTIFICATION_RECEIVED_WAKELOCK_TIMEOUT_MILLIS = 10*60*1000L /*10 minutes*/
         private const val SHARED_PREFS_ID = "SubscriberService"
diff --git a/fastlane/metadata/android/en-US/changelog/26.txt b/fastlane/metadata/android/en-US/changelog/26.txt
index 1d1851b..48ebce1 100644
--- a/fastlane/metadata/android/en-US/changelog/26.txt
+++ b/fastlane/metadata/android/en-US/changelog/26.txt
@@ -10,10 +10,11 @@ Bugs:
 * "[x] Instant delivery in doze mode" checkbox does not work properly (#211)
 * Disallow "http" GET/HEAD actions with body (#221, thanks to @cmeis for reporting)
 * Action "view" with "clear=true" does not work on some phones (#220, thanks to @cmeis for reporting)
+* Do not group foreground service notification with others (#219, thanks to @s-h-a-r-d for reporting)
 
 Additional translations:
 * Japanese (thanks to @shak)
 * Russian (thanks to @flamey and @ilya.mikheev.coder)
 
 Thanks for testing:
-* Thanks to @RasHas (aka @Shard), @cmeis, @poblabs, and everyone I forgot for testing.
+* Thanks to @s-h-a-r-d (aka @Shard), @cmeis, @poblabs, and everyone I forgot for testing.