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 ) 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..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 - if (performRefresh) { - it.listDirectory(root, MainApp.isOnlyOnDevice()) - startSyncFolderOperation(root, false) - } + it.listDirectory(root, MainApp.isOnlyOnDevice()) } binding.fabMain.setImageResource(R.drawable.ic_plus)