From 3f08832ed0d45a01806004fe6e4627d68b92e6d4 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Fri, 6 Mar 2026 15:17:35 +0100 Subject: [PATCH] fix(file-list): refresh directory Signed-off-by: alperozturk96 --- .../client/jobs/autoUpload/AutoUploadWorker.kt | 2 -- .../client/jobs/upload/FileUploadBroadcastManager.kt | 10 +--------- .../nextcloud/client/jobs/upload/FileUploadWorker.kt | 2 -- .../android/ui/activity/FileDisplayActivity.kt | 11 +---------- 4 files changed, 2 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt b/app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt index d9f2df683af0..f01af834d7a8 100644 --- a/app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt +++ b/app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt @@ -18,7 +18,6 @@ import com.nextcloud.client.account.UserAccountManager import com.nextcloud.client.database.entity.toOCUpload import com.nextcloud.client.database.entity.toUploadEntity import com.nextcloud.client.device.PowerManagementService -import com.nextcloud.client.jobs.BackgroundJobManager import com.nextcloud.client.jobs.upload.FileUploadBroadcastManager import com.nextcloud.client.jobs.upload.FileUploadWorker import com.nextcloud.client.jobs.utils.UploadErrorNotificationManager @@ -430,7 +429,6 @@ class AutoUploadWorker( fileUploadBroadcastManager.sendFinished( operation, result, - operation.oldFile?.storagePath, context ) } diff --git a/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadBroadcastManager.kt b/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadBroadcastManager.kt index 148e869ee8fc..4761f50cb27c 100644 --- a/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadBroadcastManager.kt +++ b/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadBroadcastManager.kt @@ -84,12 +84,7 @@ class FileUploadBroadcastManager(private val broadcastManager: LocalBroadcastMan * - [com.owncloud.android.ui.preview.PreviewImageActivity.UploadFinishReceiver] * */ - fun sendFinished( - upload: UploadFileOperation, - uploadResult: RemoteOperationResult<*>, - unlinkedFromRemotePath: String?, - context: Context - ) { + fun sendFinished(upload: UploadFileOperation, uploadResult: RemoteOperationResult<*>, context: Context) { Log_OC.d(TAG, "upload finished broadcast sent") val intent = Intent(UPLOAD_FINISHED).apply { // real remote path, after possible automatic renaming @@ -102,9 +97,6 @@ class FileUploadBroadcastManager(private val broadcastManager: LocalBroadcastMan putExtra(FileUploadWorker.EXTRA_OLD_FILE_PATH, upload.originalStoragePath) putExtra(FileUploadWorker.ACCOUNT_NAME, upload.user.accountName) putExtra(FileUploadWorker.EXTRA_UPLOAD_RESULT, uploadResult.isSuccess) - if (unlinkedFromRemotePath != null) { - putExtra(FileUploadWorker.EXTRA_LINKED_TO_PATH, unlinkedFromRemotePath) - } setPackage(context.packageName) } broadcastManager.sendBroadcast(intent) diff --git a/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt b/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt index e64ca25ca296..b9c208c1943c 100644 --- a/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt +++ b/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt @@ -81,7 +81,6 @@ class FileUploadWorker( const val EXTRA_REMOTE_PATH = "REMOTE_PATH" const val EXTRA_OLD_REMOTE_PATH = "OLD_REMOTE_PATH" const val EXTRA_OLD_FILE_PATH = "OLD_FILE_PATH" - const val EXTRA_LINKED_TO_PATH = "LINKED_TO" const val ACCOUNT_NAME = "ACCOUNT_NAME" const val EXTRA_ACCOUNT_NAME = "ACCOUNT_NAME" const val ACTION_CANCEL_BROADCAST = "CANCEL" @@ -288,7 +287,6 @@ class FileUploadWorker( fileUploadBroadcastManager.sendFinished( operation, result, - operation.oldFile?.storagePath, context ) } 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 21a74acb64bf..134e0d04f25f 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 @@ -1698,10 +1698,7 @@ class FileDisplayActivity : currentDir != null && uploadedRemotePath != null && uploadedRemotePath.startsWith(currentDir.remotePath) if (sameAccount && isDescendant) { - val linkedToRemotePath = intent.getStringExtra(FileUploadWorker.EXTRA_LINKED_TO_PATH) - if (linkedToRemotePath == null || isAscendant(linkedToRemotePath)) { - updateListOfFilesFragment() - } + updateListOfFilesFragment() } val uploadWasFine = intent.getBooleanExtra(FileUploadWorker.EXTRA_UPLOAD_RESULT, false) @@ -1749,12 +1746,6 @@ class FileDisplayActivity : } } } - - // TODO refactor this receiver, and maybe DownloadFinishReceiver; this method is duplicated :S - fun isAscendant(linkedToRemotePath: String): Boolean { - val currentDir = getCurrentDir() - return currentDir != null && currentDir.remotePath.startsWith(linkedToRemotePath) - } } /**