From 8d719c9455bb6ba8b84c782c99c5603057565dfb Mon Sep 17 00:00:00 2001
From: Michael Kourlas <michael@kourlas.com>
Date: Sat, 27 Jan 2024 02:36:59 -0500
Subject: [PATCH] Remove data sync foreground service type

---
 voipms-sms/src/main/AndroidManifest.xml                     | 5 +----
 .../kourlas/voipms_sms/sms/workers/RetrieveDidsWorker.kt    | 6 +-----
 .../net/kourlas/voipms_sms/sms/workers/SendMessageWorker.kt | 6 +-----
 .../kotlin/net/kourlas/voipms_sms/sms/workers/SyncWorker.kt | 6 +-----
 .../voipms_sms/sms/workers/VerifyCredentialsWorker.kt       | 6 +-----
 .../workers/NotificationsRegistrationWorker.kt              | 6 +-----
 6 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/voipms-sms/src/main/AndroidManifest.xml b/voipms-sms/src/main/AndroidManifest.xml
index 2febb827..0443f0ee 100644
--- a/voipms-sms/src/main/AndroidManifest.xml
+++ b/voipms-sms/src/main/AndroidManifest.xml
@@ -42,9 +42,6 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission
-        android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"
-        android:maxSdkVersion="33" />
 
     <!-- Vibration when notification received -->
     <uses-permission android:name="android.permission.VIBRATE" />
@@ -267,7 +264,7 @@
 
         <service
             android:name="androidx.work.impl.foreground.SystemForegroundService"
-            android:foregroundServiceType="shortService|dataSync"
+            android:foregroundServiceType="shortService"
             tools:ignore="Instantiatable"
             tools:node="merge" />
     </application>
diff --git a/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/RetrieveDidsWorker.kt b/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/RetrieveDidsWorker.kt
index 964bb5c1..f21a66c1 100644
--- a/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/RetrieveDidsWorker.kt
+++ b/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/RetrieveDidsWorker.kt
@@ -82,11 +82,7 @@ class RetrieveDidsWorker(context: Context, params: WorkerParameters) :
             ForegroundInfo(
                 Notifications.SYNC_RETRIEVE_DIDS_NOTIFICATION_ID,
                 notification,
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-                    ServiceInfo.FOREGROUND_SERVICE_TYPE_SHORT_SERVICE
-                } else {
-                    ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
-                }
+                ServiceInfo.FOREGROUND_SERVICE_TYPE_SHORT_SERVICE
             )
         } else {
             ForegroundInfo(
diff --git a/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/SendMessageWorker.kt b/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/SendMessageWorker.kt
index 0b3d72a0..5f338de9 100644
--- a/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/SendMessageWorker.kt
+++ b/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/SendMessageWorker.kt
@@ -131,11 +131,7 @@ class SendMessageWorker(context: Context, params: WorkerParameters) :
             ForegroundInfo(
                 Notifications.SYNC_SEND_MESSAGE_NOTIFICATION_ID,
                 notification,
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-                    ServiceInfo.FOREGROUND_SERVICE_TYPE_SHORT_SERVICE
-                } else {
-                    ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
-                }
+                ServiceInfo.FOREGROUND_SERVICE_TYPE_SHORT_SERVICE
             )
         } else {
             ForegroundInfo(
diff --git a/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/SyncWorker.kt b/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/SyncWorker.kt
index c7a8b088..90b35163 100644
--- a/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/SyncWorker.kt
+++ b/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/SyncWorker.kt
@@ -124,11 +124,7 @@ class SyncWorker(context: Context, params: WorkerParameters) :
             ForegroundInfo(
                 Notifications.SYNC_DATABASE_NOTIFICATION_ID,
                 notification,
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-                    ServiceInfo.FOREGROUND_SERVICE_TYPE_SHORT_SERVICE
-                } else {
-                    ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
-                }
+                ServiceInfo.FOREGROUND_SERVICE_TYPE_SHORT_SERVICE
             )
         } else {
             ForegroundInfo(
diff --git a/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/VerifyCredentialsWorker.kt b/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/VerifyCredentialsWorker.kt
index d22f2956..ad778e5f 100644
--- a/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/VerifyCredentialsWorker.kt
+++ b/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/VerifyCredentialsWorker.kt
@@ -84,11 +84,7 @@ class VerifyCredentialsWorker(context: Context, params: WorkerParameters) :
             ForegroundInfo(
                 Notifications.SYNC_VERIFY_CREDENTIALS_NOTIFICATION_ID,
                 notification,
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-                    ServiceInfo.FOREGROUND_SERVICE_TYPE_SHORT_SERVICE
-                } else {
-                    ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
-                }
+                ServiceInfo.FOREGROUND_SERVICE_TYPE_SHORT_SERVICE
             )
         } else {
             ForegroundInfo(
diff --git a/voipms-sms/src/primary/kotlin/net/kourlas/voipms_sms/notifications/workers/NotificationsRegistrationWorker.kt b/voipms-sms/src/primary/kotlin/net/kourlas/voipms_sms/notifications/workers/NotificationsRegistrationWorker.kt
index e1005db7..7dad7ae2 100644
--- a/voipms-sms/src/primary/kotlin/net/kourlas/voipms_sms/notifications/workers/NotificationsRegistrationWorker.kt
+++ b/voipms-sms/src/primary/kotlin/net/kourlas/voipms_sms/notifications/workers/NotificationsRegistrationWorker.kt
@@ -111,11 +111,7 @@ class NotificationsRegistrationWorker(
             ForegroundInfo(
                 Notifications.SYNC_REGISTER_PUSH_NOTIFICATION_ID,
                 notification,
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-                    ServiceInfo.FOREGROUND_SERVICE_TYPE_SHORT_SERVICE
-                } else {
-                    ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
-                }
+                ServiceInfo.FOREGROUND_SERVICE_TYPE_SHORT_SERVICE
             )
         } else {
             ForegroundInfo(