fix(oc-file-list): favorite refresh #17018
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1680,6 +1680,10 @@ class FileDisplayActivity : | |
| it.setEmptyListMessage(EmptyListState.ONLY_ON_DEVICE) | ||
| } | ||
|
|
||
| it.searchEvent?.searchType == SearchRemoteOperation.SearchType.FAVORITE_SEARCH -> { | ||
| it.setEmptyListMessage(SearchType.FAVORITE_SEARCH) | ||
| } | ||
|
|
||
| else -> it.setEmptyListMessage(SearchType.NO_SEARCH) | ||
| } | ||
| } | ||
|
|
@@ -2163,41 +2167,34 @@ class FileDisplayActivity : | |
| */ | ||
| private fun onRemoveFileOperationFinish(operation: RemoveFileOperation, result: RemoteOperationResult<*>) { | ||
| deleteBatchTracker.onSingleDeleteFinished() | ||
| if (!result.isSuccess && result.isSslRecoverableException) { | ||
| mLastSslUntrustedServerResult = result | ||
| showUntrustedCertDialog(mLastSslUntrustedServerResult) | ||
| return | ||
| } | ||
|
|
||
| val removedFile = operation.file | ||
| tryStopPlaying(removedFile) | ||
| val leftFragment = this.leftFragment | ||
|
|
||
| // check if file is still available, if so do nothing | ||
| val fileAvailable = storageManager.fileExists(removedFile.fileId) | ||
| if (leftFragment is FileFragment && !fileAvailable && removedFile == leftFragment.file) { | ||
| file = storageManager.getFileById(removedFile.parentId) | ||
| resetScrollingAndUpdateActionBar() | ||
| } | ||
|
|
||
| if (leftFragment is OCFileListFragment) { | ||
| leftFragment.adapter?.removeFile(removedFile) | ||
|
|
||
| if (leftFragment.adapter?.isEmpty == true) { | ||
| val emptyState = leftFragment.searchEvent?.toSearchType() ?: SearchType.NO_SEARCH | ||
| leftFragment.setEmptyListMessage(emptyState) | ||
| } | ||
| } | ||
|
|
||
| supportInvalidateOptionsMenu() | ||
| fetchRecommendedFilesIfNeeded(ignoreETag = true, currentDir) | ||
| } | ||
|
|
||
| override fun onAutoUploadFolderRemoved( | ||
|
|
@@ -2341,38 +2338,7 @@ class FileDisplayActivity : | |
| private fun onRenameFileOperationFinish(operation: RenameFileOperation, result: RemoteOperationResult<*>) { | ||
| val optionalUser = user | ||
| val renamedFile = operation.file | ||
|
Collaborator
Author
There was a problem hiding this comment.
Is there any reason to use this condition here @tobiasKaminsky ?
Member
There was a problem hiding this comment. We need it, yes. If e.g. someone renames a file and directly navigates to another folder. |
||
| if (!result.isSuccess || optionalUser.isEmpty) { | ||
| DisplayUtils.showSnackMessage( | ||
| this, | ||
| ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()) | ||
|
|
@@ -2382,6 +2348,53 @@ class FileDisplayActivity : | |
| mLastSslUntrustedServerResult = result | ||
| showUntrustedCertDialog(mLastSslUntrustedServerResult) | ||
| } | ||
| return | ||
| } | ||
|
|
||
| val currentUser = optionalUser.get() | ||
| val leftFragment = this.leftFragment | ||
| if (leftFragment is FileFragment) { | ||
| onRenameFileOperationFinishForFileFragment(leftFragment, renamedFile, currentUser) | ||
| } | ||
|
|
||
| updateListOfFilesFragment() | ||
| refreshGalleryFragmentIfNeeded() | ||
| fetchRecommendedFilesIfNeeded(ignoreETag = true, currentDir) | ||
| } | ||
|
|
||
| private fun onRenameFileOperationFinishForFileFragment(fragment: FileFragment, ocFile: OCFile, user: User) { | ||
| if (fragment.file != ocFile) return | ||
|
|
||
| when (fragment) { | ||
| is FileDetailFragment -> { | ||
| fragment.updateFileDetails(ocFile, user) | ||
| showDetails(ocFile) | ||
| } | ||
|
|
||
| is PreviewMediaFragment -> { | ||
| fragment.updateFile(ocFile) | ||
| if (PreviewMediaFragment.canBePreviewed(ocFile)) { | ||
| startMediaPreview( | ||
| ocFile, | ||
| fragment.position, | ||
| true, | ||
| true, | ||
| true, | ||
| false | ||
| ) | ||
| } else { | ||
| fileOperationsHelper.openFile(ocFile) | ||
| } | ||
| } | ||
|
|
||
| is PreviewTextFileFragment -> { | ||
| fragment.updateFile(ocFile) | ||
| if (PreviewTextFileFragment.canBePreviewed(ocFile)) { | ||
| startTextPreview(ocFile, true) | ||
| } else { | ||
| fileOperationsHelper.openFile(ocFile) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please adopt to use it like in " setSortOrder(FileSortOrder.Type type"