From 5456297612158d9d27ff322cf2c4a27add5a0118 Mon Sep 17 00:00:00 2001
From: Mike Barnes <mike@grousemedia.com>
Date: Sun, 23 Mar 2025 10:06:56 +1100
Subject: [PATCH] Merge Tusky PR 4292 to fix sending posts on API 34.

---
 app/src/main/AndroidManifest.xml                 |  1 +
 .../tusky/service/SendStatusService.kt           | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e2d29c88..6983da99 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -197,6 +197,7 @@
         </service>
 
         <service android:name=".service.SendStatusService"
+            android:foregroundServiceType="shortService"
             android:exported="false" />
 
         <provider
diff --git a/app/src/main/java/com/keylesspalace/tusky/service/SendStatusService.kt b/app/src/main/java/com/keylesspalace/tusky/service/SendStatusService.kt
index cf03115b..bafce4eb 100644
--- a/app/src/main/java/com/keylesspalace/tusky/service/SendStatusService.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/service/SendStatusService.kt
@@ -115,15 +115,23 @@ class SendStatusService : Service(), Injectable {
 
             statusesToSend[sendingNotificationId] = statusToSend
             sendStatus(sendingNotificationId--)
-        } else {
-            if (intent.hasExtra(KEY_CANCEL)) {
-                cancelSending(intent.getIntExtra(KEY_CANCEL, 0))
-            }
+        } else if (intent.hasExtra(KEY_CANCEL)) {
+            cancelSending(intent.getIntExtra(KEY_CANCEL, 0))
         }
 
         return START_NOT_STICKY
     }
 
+    override fun onTimeout(startId: Int) {
+        // https://developer.android.com/about/versions/14/changes/fgs-types-required#short-service
+        // max time for short service reached on Android 14+, stop sending
+        statusesToSend.forEach { (statusId, _) ->
+            serviceScope.launch {
+                failSending(statusId)
+            }
+        }
+    }
+
     private fun sendStatus(statusId: Int) {
         // when statusToSend == null, sending has been canceled
         val statusToSend = statusesToSend[statusId] ?: return