diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt index 75cad529..fea92b5f 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt @@ -271,6 +271,7 @@ class ComposeViewModel @Inject constructor( mediaFocus = mediaFocus, poll = poll.value, failedToSend = false, + failedToSendAlert = false, scheduledAt = scheduledAt.value, language = postLanguage, statusId = originalStatusId, diff --git a/app/src/main/java/com/keylesspalace/tusky/components/drafts/DraftHelper.kt b/app/src/main/java/com/keylesspalace/tusky/components/drafts/DraftHelper.kt index b03f88af..5d2d852a 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/drafts/DraftHelper.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/drafts/DraftHelper.kt @@ -63,6 +63,7 @@ class DraftHelper @Inject constructor( mediaFocus: List, poll: NewPoll?, failedToSend: Boolean, + failedToSendAlert: Boolean, scheduledAt: String?, language: String?, statusId: String?, @@ -123,7 +124,7 @@ class DraftHelper @Inject constructor( attachments = attachments, poll = poll, failedToSend = failedToSend, - failedToSendNew = failedToSend, + failedToSendNew = failedToSendAlert, scheduledAt = scheduledAt, language = language, statusId = statusId, 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 9815ad8e..42365aff 100644 --- a/app/src/main/java/com/keylesspalace/tusky/service/SendStatusService.kt +++ b/app/src/main/java/com/keylesspalace/tusky/service/SendStatusService.kt @@ -265,7 +265,7 @@ class SendStatusService : Service(), Injectable { mediaUploader.cancelUploadScope(*failedStatus.media.map { it.localId }.toIntArray()) - saveStatusToDrafts(failedStatus) + saveStatusToDrafts(failedStatus, failedToSendAlert = true) val notification = buildDraftNotification( R.string.send_post_notification_error_title, @@ -288,7 +288,7 @@ class SendStatusService : Service(), Injectable { val sendJob = sendJobs.remove(statusId) sendJob?.cancel() - saveStatusToDrafts(statusToCancel) + saveStatusToDrafts(statusToCancel, failedToSendAlert = false) val notification = buildDraftNotification( R.string.send_post_notification_cancel_title, @@ -305,7 +305,7 @@ class SendStatusService : Service(), Injectable { } } - private suspend fun saveStatusToDrafts(status: StatusToSend) { + private suspend fun saveStatusToDrafts(status: StatusToSend, failedToSendAlert: Boolean) { draftHelper.saveDraft( draftId = status.draftId, accountId = status.accountId, @@ -319,6 +319,7 @@ class SendStatusService : Service(), Injectable { mediaFocus = status.media.map { it.focus }, poll = status.poll, failedToSend = true, + failedToSendAlert = failedToSendAlert, scheduledAt = status.scheduledAt, language = status.language, statusId = status.statusId,