Skip to content

fix(navigation): all files #17916

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 3 commits into from
Nov 4, 2026
+5 −9
Merged

fix(navigation): all files #17916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01ce97e
use correct variable name for request code
alperozturk96 Oct 30, 2026
54a8f0a
fix(navigation): all files
alperozturk96 Oct 30, 2026
8b491d8
remove dead code
alperozturk96 Oct 30, 2026
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
4 changes: 2 additions & 2 deletions app/src/main/java/com/nextcloud/client/notifications/AppWideNotificationManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
)
Expand Down
10 changes: 3 additions & 7 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 @@ -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")
Expand Down Expand Up @@ -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)

@alperozturk96 alperozturk96 Nov 4, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@daniele-verducci let's check startSyncFolderOperation(root, false) is really needed?

}
it.listDirectory(root, MainApp.isOnlyOnDevice())
}

binding.fabMain.setImageResource(R.drawable.ic_plus)
Expand Down
Loading