Multi user file browsing, closes #2479 #2482
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
harshad1
commented
Dec 12, 2024
| } else if (VIRTUAL_STORAGE_RECENTS.equals(displayFile)) { | ||
| holder.image.setImageResource(R.drawable.ic_history_black_24dp); | ||
| } else { | ||
| holder.image.setImageResource(isFile ? _dopt.fileImage : _dopt.folderImage); |
There was a problem hiding this comment.
Use the specific images for these folders
harshad1
commented
Dec 12, 2024
| @@ -529,15 +554,13 @@ public boolean canGoBack() { | |||
|
|
|||
| public boolean goUp() { | |||
| if (_currentFolder != null && canGoUp()) { | |||
| if (_reverseVirtualMapping.containsKey(_currentFolder)) { | |||
| loadFolder(VIRTUAL_STORAGE_ROOT, _reverseVirtualMapping.get(_currentFolder)); | |||
| final File parent = _currentFolder.getParentFile(); | |||
There was a problem hiding this comment.
Go up to parent even if listed as a virtual folder in root
harshad1
commented
Dec 12, 2024
| @@ -81,9 +81,8 @@ public static GsFileBrowserOptions.Options prepareFsViewerOpts( | |||
| opts.favouriteFiles = appSettings.getFavouriteFiles(); | |||
| opts.recentFiles = appSettings.getRecentFiles(); | |||
| opts.popularFiles = appSettings.getPopularFiles(); | |||
| opts.storageMaps.clear(); | |||
| opts.storageMaps.put(new File("/storage", cu.rstr(context, R.string.notebook)), appSettings.getNotebookDirectory()); | |||
| opts.storageMaps.put(new File("/storage/Download"), new File("/storage/emulated/0/Download")); | |||
There was a problem hiding this comment.
Download folder resolved using API now
harshad1
commented
Dec 12, 2024
| @@ -235,7 +235,7 @@ private void updateMenuItems() { | |||
| // Check if is a favourite | |||
| boolean selTextFilesOnly = true; | |||
| boolean selDirectoriesOnly = true; | |||
| boolean selWritable = (!curFilepath.equals("/storage") && !curFilepath.equals("/storage/emulated")); | |||
| boolean selWritable = true; | |||
There was a problem hiding this comment.
We don't hardcode these like this now
harshad1
commented
Dec 12, 2024
| @@ -679,27 +707,28 @@ private void loadFolder(final File folder, final File show) { | |||
| final File toShow = show == null ? _fileToShowAfterNextLoad : show; | |||
| _fileToShowAfterNextLoad = null; | |||
|
|
|||
| _currentFolder = folder; | |||
There was a problem hiding this comment.
We set this early and in the wrapping sync function. Prevents bugs from preventing this from being set.
harshad1
commented
Dec 18, 2024
| if (_hlEditor != null) { | ||
| _hlEditor.toggleCase(); | ||
| } | ||
| TextViewUtils.toggleSelectionCase(_hlEditor.getText()); |
There was a problem hiding this comment.
Cleanups to how these are structured and organized
harshad1
commented
Dec 18, 2024
| }; | ||
| opts.refresh.callback(); | ||
| // These should be refreshed in onFsViewerConfig | ||
| opts.sortFolderFirst = appSettings.isFileBrowserSortFolderFirst(); |
There was a problem hiding this comment.
These don't really need to be refreshed dynamically
harshad1
commented
Dec 18, 2024
| final String filename = displayFile.getName(); | ||
| final String currentFolderName = _currentFolder != null ? _currentFolder.getName() : ""; | ||
| final File currentFolderParent = _currentFolder != null ? _currentFolder.getParentFile() : null; | ||
| final File file = GsCollectionUtils.getOrDefault(_virtualMapping, displayFile, displayFile); |
There was a problem hiding this comment.
All of this is identical but cleaned up
harshad1
commented
Dec 18, 2024
| // This function is not called on the main thread, so post to the UI thread | ||
| private synchronized void _loadFolder(final @NonNull File folder, final @Nullable File toShow) { | ||
| // This function is not called on the main thread | ||
| private synchronized void _loadFolder(final boolean folderChanged, final @Nullable File toShow) { |
There was a problem hiding this comment.
We set _currentFolder early and just use that. Prevents some bugs
|
I think this is good to go. But I will wait for feedback and more testing. |
Closed
4 tasks
gsantner
approved these changes
Dec 22, 2024
gsantner
changed the title
|
Thanks, merged |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Supporting multiple users and adding a number of fixes
This addresses #2479