Browse Source

Merge pull request #9426 from nextcloud/fix/unified-search-apps

UnifiedSearch: Fix opening non-file results with relative URLs
Álvaro Brey 3 years ago
parent
commit
0edba984be

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

@@ -147,8 +147,19 @@ class UnifiedSearchViewModel(application: Application) : AndroidViewModel(applic
         if (result.isFile) {
         if (result.isFile) {
             openFile(result.remotePath())
             openFile(result.remotePath())
         } else {
         } else {
-            val uri = Uri.parse(result.resourceUrl)
-            this.browserUri.value = uri
+            this.browserUri.value = getResultUri(result)
+        }
+    }
+
+    private fun getResultUri(result: SearchResultEntry): Uri {
+        val uri = Uri.parse(result.resourceUrl)
+        return when (uri.host) {
+            null -> {
+                val serverUrl = currentAccountProvider.user.server.uri.toString()
+                val fullUrl = serverUrl + result.resourceUrl
+                Uri.parse(fullUrl)
+            }
+            else -> uri
         }
         }
     }
     }