From 01ce97e45338e821fc874ab7bcbd091eef451c3e Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Fri, 30 Oct 2026 15:39:35 +0300 Subject: [PATCH 1/3] use correct variable name for request code Signed-off-by: alperozturk96 --- .../client/notifications/AppWideNotificationManager.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/notifications/AppWideNotificationManager.kt b/app/src/main/java/com/nextcloud/client/notifications/AppWideNotificationManager.kt index bdd9f88fa0aa..3bab1e3f890e 100644 --- a/app/src/main/java/com/nextcloud/client/notifications/AppWideNotificationManager.kt +++ b/app/src/main/java/com/nextcloud/client/notifications/AppWideNotificationManager.kt @@ -33,7 +33,7 @@ object AppWideNotificationManager { private const val TAG = "AppWideNotificationManager" - private const val SYNC_CONFLICT_NOTIFICATION_INTENT_REQ_CODE = 16 + private const val UPLOAD_LIST_REQUEST_CODE = 16 private const val SYNC_CONFLICT_NOTIFICATION_INTENT_ACTION_REQ_CODE = 17 private const val SYNC_CONFLICT_NOTIFICATION_ID = 112 @@ -45,7 +45,7 @@ object AppWideNotificationManager { return PendingIntent.getActivity( context, - SYNC_CONFLICT_NOTIFICATION_INTENT_REQ_CODE, + UPLOAD_LIST_REQUEST_CODE, intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE ) From 54a8f0a49512be0c87d0a571169b4174a4fe6e95 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Fri, 30 Oct 2026 16:01:08 +0300 Subject: [PATCH 2/3] fix(navigation): all files Signed-off-by: alperozturk96 --- .../com/owncloud/android/ui/activity/FileDisplayActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ff83034b36db..8d3170a073fb 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 @@ -1073,8 +1073,8 @@ class FileDisplayActivity : val root = storageManager.getFileByPath(OCFile.ROOT_PATH) it.resetSearchAttributes() file = root + it.listDirectory(root, MainApp.isOnlyOnDevice()) if (performRefresh) { - it.listDirectory(root, MainApp.isOnlyOnDevice()) startSyncFolderOperation(root, false) } } From 8b491d86a85dfe26212a1b4ecb048960c6a4ce4c Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Fri, 30 Oct 2026 16:08:44 +0300 Subject: [PATCH 3/3] remove dead code Signed-off-by: alperozturk96 --- .../owncloud/android/ui/activity/FileDisplayActivity.kt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) 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 8d3170a073fb..e05df2013b48 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 @@ -746,8 +746,7 @@ class FileDisplayActivity : listFragmentJustCreated = true } - // the onResume() following this intent already lists and re-syncs the current directory - browseToRoot(performRefresh = false) + browseToRoot() } @SuppressLint("UnsafeIntentLaunch") @@ -1068,15 +1067,12 @@ class FileDisplayActivity : } } - fun browseToRoot(performRefresh: Boolean = true) { + private fun browseToRoot() { listOfFilesFragment?.let { val root = storageManager.getFileByPath(OCFile.ROOT_PATH) it.resetSearchAttributes() file = root it.listDirectory(root, MainApp.isOnlyOnDevice()) - if (performRefresh) { - startSyncFolderOperation(root, false) - } } binding.fabMain.setImageResource(R.drawable.ic_plus)