Skip to content

fix(file-action): edit #16772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alperozturk96 merged 1 commit into from
Mar 30, 2026
Merged

fix(file-action): edit #16772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadWorker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ class FileDownloadWorker(
checkDownloadError(it)
}

val removeResult = pendingDownloads.removePayload(
pendingDownloads.removePayload(
currentDownload?.user?.accountName,
currentDownload?.remotePath
)
Expand Down
10 changes: 4 additions & 6 deletions app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1827,7 +1827,7 @@ class FileDisplayActivity :

if (fileIDForImmediatePreview == -1L) {
Log_OC.d(TAG, "updating ui for file download")
updateUIForFileDownload()
updateUIForFileDownload(intent)
return
}

Expand All @@ -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)
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -2720,8 +2720,6 @@ class FileDisplayActivity :
packageName,
this.javaClass.simpleName
)
updateActionBarTitleAndHomeButton(file)
setFile(file)
}
}

Expand Down
Loading