From 698518e81f2f924121bb85bff79b9db59cf64d42 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Mon, 30 Mar 2026 10:30:10 +0200 Subject: [PATCH] fix(file-action): edit Signed-off-by: alperozturk96 --- .../client/jobs/download/FileDownloadWorker.kt | 2 +- .../android/ui/activity/FileDisplayActivity.kt | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadWorker.kt b/app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadWorker.kt index 5a3bcaa79c76..d9febd6e48b3 100644 --- a/app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadWorker.kt +++ b/app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadWorker.kt @@ -318,7 +318,7 @@ class FileDownloadWorker( checkDownloadError(it) } - val removeResult = pendingDownloads.removePayload( + pendingDownloads.removePayload( currentDownload?.user?.accountName, currentDownload?.remotePath ) diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt index b690c9ee9cd6..05178e85acaa 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt +++ b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt @@ -1827,7 +1827,7 @@ class FileDisplayActivity : if (fileIDForImmediatePreview == -1L) { Log_OC.d(TAG, "updating ui for file download") - updateUIForFileDownload() + updateUIForFileDownload(intent) return } @@ -1847,7 +1847,7 @@ class FileDisplayActivity : } } - private fun updateUIForFileDownload() { + private fun updateUIForFileDownload(intent: Intent) { val sameAccount = isSameAccount(intent) val downloadedRemotePath = intent.getStringExtra(FileDownloadEventBroadcaster.EXTRA_REMOTE_PATH) val downloadBehaviour = intent.getStringExtra(FileDownloadEventBroadcaster.EXTRA_DOWNLOAD_BEHAVIOUR) @@ -2493,8 +2493,8 @@ class FileDisplayActivity : private fun requestForDownload(file: OCFile, downloadBehaviour: String, packageName: String, activityName: String) { val currentUser = user.orElseThrow(Supplier { RuntimeException() }) - if (!FileDownloadHelper.Companion.instance().isDownloading(currentUser, file)) { - FileDownloadHelper.Companion.instance().downloadFile( + if (!FileDownloadHelper.instance().isDownloading(currentUser, file)) { + FileDownloadHelper.instance().downloadFile( currentUser, file, downloadBehaviour, @@ -2720,8 +2720,6 @@ class FileDisplayActivity : packageName, this.javaClass.simpleName ) - updateActionBarTitleAndHomeButton(file) - setFile(file) } }