From 478dd8c601be7b3823e8a6818f4ced5966b3e9ab Mon Sep 17 00:00:00 2001
From: Conny Duck <k.pozniak@gmx.at>
Date: Tue, 29 Nov 2022 19:43:11 +0100
Subject: [PATCH] improve code

---
 .../com/keylesspalace/tusky/components/compose/MediaUploader.kt | 2 +-
 .../java/com/keylesspalace/tusky/service/SendStatusService.kt   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/MediaUploader.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/MediaUploader.kt
index 9b2236d05..1b83b316a 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/compose/MediaUploader.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/MediaUploader.kt
@@ -145,7 +145,7 @@ class MediaUploader @Inject constructor(
      */
     fun cancelUploadScope(vararg localMediaIds: Int) {
         localMediaIds.forEach { localId ->
-            uploads[localId]?.scope?.cancel()
+            uploads.remove(localId)?.scope?.cancel()
         }
     }
 
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 cced705e8..ac430769f 100644
--- a/app/src/main/java/com/keylesspalace/tusky/service/SendStatusService.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/service/SendStatusService.kt
@@ -144,6 +144,7 @@ class SendStatusService : Service(), Injectable {
                         is UploadEvent.ErrorEvent -> {
                             Log.w(TAG, "failed uploading media", uploadState.error)
                             failSending(statusId)
+                            stopSelfWhenDone()
                             return@launch
                         }
                     }