From 69ed9b86ba148293000f4d3848b8bcb37af984e8 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Sun, 16 Feb 2025 23:08:38 +0100 Subject: [PATCH] Fix: Crash on stopping download --- .../com/machiav3lli/fdroid/manager/work/DownloadWorker.kt | 7 +++---- .../com/machiav3lli/fdroid/manager/work/InstallWorker.kt | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/com/machiav3lli/fdroid/manager/work/DownloadWorker.kt b/src/main/kotlin/com/machiav3lli/fdroid/manager/work/DownloadWorker.kt index 59e09cc50..368420818 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/manager/work/DownloadWorker.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/manager/work/DownloadWorker.kt @@ -18,7 +18,6 @@ import androidx.work.WorkerParameters import androidx.work.workDataOf import com.anggrayudi.storage.file.children import com.anggrayudi.storage.file.toDocumentFile -import com.google.common.util.concurrent.ListenableFuture import com.machiav3lli.fdroid.ARG_AUTHENTICATION import com.machiav3lli.fdroid.ARG_NAME import com.machiav3lli.fdroid.ARG_PACKAGE_NAME @@ -90,7 +89,7 @@ class DownloadWorker( val callback: suspend (read: Long, total: Long?, downloadID: Long) -> Unit = { read, total, downloadID -> - setProgress( + setProgressData( workDataOf( ARG_PROGRESS to if (total != null) (100f * read / total).roundToInt() else -1, ARG_READ to read, @@ -161,8 +160,8 @@ class DownloadWorker( ) } - override fun setProgressAsync(data: Data): ListenableFuture { - return super.setProgressAsync( + fun setProgressData(data: Data) { + setProgressAsync( Data.Builder() .putAll(data) .putLong(ARG_STARTED, task.started) diff --git a/src/main/kotlin/com/machiav3lli/fdroid/manager/work/InstallWorker.kt b/src/main/kotlin/com/machiav3lli/fdroid/manager/work/InstallWorker.kt index d8794ce55..f9b197009 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/manager/work/InstallWorker.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/manager/work/InstallWorker.kt @@ -120,6 +120,7 @@ class InstallWorker( ) } + // TODO replace with setProgressData and make use of it override fun setProgressAsync(data: Data): ListenableFuture { return super.setProgressAsync( Data.Builder()