From c72ed10cab037d59a20284bdd9e481d1e5e4e112 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <phil@heckel.io>
Date: Wed, 17 Sep 2025 13:05:17 -0400
Subject: [PATCH] Bump, re-add foreground service

---
 app/build.gradle                                            | 6 +++---
 app/src/main/AndroidManifest.xml                            | 5 +++++
 .../main/java/io/heckel/ntfy/service/SubscriberService.kt   | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a0272058..718f4d98 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,12 +18,12 @@ android {
         minSdkVersion 21
         targetSdkVersion 35
 
-        versionCode 34
-        versionName "1.17.1"
+        versionCode 35
+        versionName "1.17.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
-        /* Required for Room schema  migrations */
+        /* Required for Room schema migrations */
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments += ["room.schemaLocation": "$projectDir/schemas".toString()]
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d0c1a5e4..10c52034 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -94,6 +94,11 @@
                 android:exported="false">
         </activity>
 
+        <!-- Subscriber foreground service for hosts other than ntfy.sh -->
+        <service
+            android:name=".service.SubscriberService"
+            android:foregroundServiceType="remoteMessaging"/>
+
         <!-- Subscriber service restart on reboot -->
         <receiver
                 android:name=".service.SubscriberService$BootStartReceiver"
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 60fbb477..5abe1451 100644
--- a/app/src/main/java/io/heckel/ntfy/service/SubscriberService.kt
+++ b/app/src/main/java/io/heckel/ntfy/service/SubscriberService.kt
@@ -100,7 +100,7 @@ class SubscriberService : Service() {
         serviceNotification = createNotification(title, text)
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            startForeground(NOTIFICATION_SERVICE_ID, serviceNotification!!, ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
+            startForeground(NOTIFICATION_SERVICE_ID, serviceNotification!!, ServiceInfo.FOREGROUND_SERVICE_TYPE_REMOTE_MESSAGING)
         } else {
             startForeground(NOTIFICATION_SERVICE_ID, serviceNotification)
         }