mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 23:28:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #9175 from nextcloud/fix/url-parse-search-result

Browse source 
Unified search: skip local file check for non-file results
This commit is contained in:
Álvaro Brey 2021-11-04 14:27:25 +01:00 committed by GitHub
commit 35a2324482
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchItemViewHolder.kt
View file

@ -59,13 +59,11 @@ class UnifiedSearchItemViewHolder(
binding.title.text = entry.title binding.title.text = entry.title
binding.subline.text = entry.subline binding.subline.text = entry.subline
storageManager.getFileByDecryptedRemotePath(entry.remotePath())?.let { if (entry.isFile && storageManager.getFileByDecryptedRemotePath(entry.remotePath()) != null) {
if (it.isDown) {
binding.localFileIndicator.visibility = View.VISIBLE binding.localFileIndicator.visibility = View.VISIBLE
} else { } else {
binding.localFileIndicator.visibility = View.GONE binding.localFileIndicator.visibility = View.GONE
} }
}
val mimetype = MimeTypeUtil.getBestMimeTypeByFilename(entry.title) val mimetype = MimeTypeUtil.getBestMimeTypeByFilename(entry.title)

2
src/main/java/com/owncloud/android/ui/unifiedsearch/UnifiedSearchViewModel.kt
View file

@ -144,7 +144,7 @@ class UnifiedSearchViewModel(application: Application) : AndroidViewModel(applic
} }
override fun openResult(result: SearchResultEntry) { override fun openResult(result: SearchResultEntry) {
if (result.fileId() != null) { if (result.isFile) {
openFile(result.remotePath()) openFile(result.remotePath())
} else { } else {
val uri = Uri.parse(result.resourceUrl) val uri = Uri.parse(result.resourceUrl)