浏览代码

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

Unified search: skip local file check for non-file results
Álvaro Brey 3 年之前
父节点
当前提交
35a2324482

+ 4 - 6
src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchItemViewHolder.kt

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

+ 1 - 1
src/main/java/com/owncloud/android/ui/unifiedsearch/UnifiedSearchViewModel.kt

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