oC10 now uses meta endpoint to retrieve remote path, just like oCIS

JuancaG05 · JuancaG05 · commit 642aa629660e · 2023-11-30T13:15:48.000+01:00
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/HeadMethod.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/HeadMethod.kt
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/GetRemoteMetaFileOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/GetRemoteMetaFileOperation.kt
@@ -49,7 +49,9 @@ class GetRemoteMetaFileOperation(val fileId: String) : RemoteOperation<RemoteMet
         return try {
 
             val propFindMethod =
-                PropfindMethod(URL(stringUrl), DavConstants.DEPTH_0, arrayOf(OCMetaPathForUser.NAME)).apply {
+                PropfindMethod(URL(stringUrl), DavConstants.DEPTH_0,
+                    arrayOf(OCMetaPathForUser.NAME, OCId.NAME, OCFileId.NAME, OCSpaceId.NAME)
+                ).apply {
                     setReadTimeout(TIMEOUT, TimeUnit.SECONDS)
                     setConnectionTimeout(TIMEOUT, TimeUnit.SECONDS)
                 }
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/GetRemotePathForFileIdOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/GetRemotePathForFileIdOperation.kt
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/FileService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/FileService.kt
@@ -87,7 +87,6 @@ interface FileService : Service {
 
     fun getMetaFileInfo(
         fileId: String,
-        isOcis: Boolean
     ): RemoteOperationResult<RemoteMetaFile>
 
 }
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/implementation/OCFileService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/implementation/OCFileService.kt
@@ -30,7 +30,6 @@ import com.owncloud.android.lib.resources.files.CopyRemoteFileOperation
 import com.owncloud.android.lib.resources.files.CreateRemoteFolderOperation
 import com.owncloud.android.lib.resources.files.DownloadRemoteFileOperation
 import com.owncloud.android.lib.resources.files.GetRemoteMetaFileOperation
-import com.owncloud.android.lib.resources.files.GetRemotePathForFileIdOperation
 import com.owncloud.android.lib.resources.files.MoveRemoteFileOperation
 import com.owncloud.android.lib.resources.files.ReadRemoteFileOperation
 import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation
@@ -144,10 +143,8 @@ class OCFileService(override val client: OwnCloudClient) : FileService {
             spaceWebDavUrl = spaceWebDavUrl,
         ).execute(client)
 
-    override fun getMetaFileInfo(fileId: String, isOcis: Boolean): RemoteOperationResult<RemoteMetaFile> =
-        if (isOcis) {
-            GetRemoteMetaFileOperation(fileId)
-        } else {
-            GetRemotePathForFileIdOperation(fileId)
-        }.execute(client)
+    override fun getMetaFileInfo(
+        fileId: String,
+    ): RemoteOperationResult<RemoteMetaFile> =
+        GetRemoteMetaFileOperation(fileId).execute(client)
 }
diff --git a/owncloudData/src/main/java/com/owncloud/android/data/files/datasources/RemoteFileDataSource.kt b/owncloudData/src/main/java/com/owncloud/android/data/files/datasources/RemoteFileDataSource.kt
@@ -94,7 +94,6 @@ interface RemoteFileDataSource {
     fun getMetaFile(
         fileId: String,
         accountName: String,
-        isOcis: Boolean
     ): OCMetaFile
 
 }
diff --git a/owncloudData/src/main/java/com/owncloud/android/data/files/datasources/implementation/OCRemoteFileDataSource.kt b/owncloudData/src/main/java/com/owncloud/android/data/files/datasources/implementation/OCRemoteFileDataSource.kt
@@ -208,9 +208,8 @@ class OCRemoteFileDataSource(
     override fun getMetaFile(
         fileId: String,
         accountName: String,
-        isOcis: Boolean
     ): OCMetaFile = executeRemoteOperation {
-            clientManager.getFileService(accountName).getMetaFileInfo(fileId, isOcis)
+            clientManager.getFileService(accountName).getMetaFileInfo(fileId)
         }.toModel()
 
     companion object {
diff --git a/owncloudData/src/main/java/com/owncloud/android/data/files/repository/OCFileRepository.kt b/owncloudData/src/main/java/com/owncloud/android/data/files/repository/OCFileRepository.kt
@@ -165,6 +165,33 @@ class OCFileRepository(
     override fun getFileByRemotePath(remotePath: String, owner: String, spaceId: String?): OCFile? =
         localFileDataSource.getFileByRemotePath(remotePath, owner, spaceId)
 
+    override fun getFileFromRemoteId(fileId: String, accountName: String): OCFile? {
+        val metaFile = remoteFileDataSource.getMetaFile(fileId, accountName)
+        val remotePath = metaFile.path!!
+
+        val splitPath = remotePath.split(PATH_SEPARATOR)
+        var containerFolder = listOf<OCFile>()
+        for (i in 0..splitPath.size - 2) {
+            var path = splitPath[0]
+            for (j in 1..i) {
+                path += "$PATH_SEPARATOR${splitPath[j]}"
+            }
+            containerFolder = refreshFolder(path, accountName, metaFile.spaceId)
+        }
+        refreshFolder(remotePath, accountName, metaFile.spaceId)
+        return if (remotePath == ROOT_PATH) {
+            getFileByRemotePath(remotePath, accountName, metaFile.spaceId)
+        } else {
+            containerFolder.find { file ->
+                if (file.isFolder) {
+                    file.remotePath.dropLast(1)
+                } else {
+                    file.remotePath
+                } == remotePath
+            }
+        }
+    }
+
     override fun getPersonalRootFolderForAccount(owner: String): OCFile {
         val personalSpace = localSpacesDataSource.getPersonalSpaceForAccount(owner)
         if (personalSpace == null) {
@@ -530,33 +557,6 @@ class OCFileRepository(
         localFileDataSource.updateFileWithLastUsage(fileId, lastUsage)
     }
 
-    override fun getFileFromRemoteId(fileId: String, accountName: String, isOcis: Boolean): OCFile? {
-        val metaFile = remoteFileDataSource.getMetaFile(fileId, accountName, isOcis)
-        val remotePath = metaFile.path!!
-
-        val splitPath = remotePath.split(PATH_SEPARATOR)
-        var containerFolder = listOf<OCFile>()
-        for (i in 0..splitPath.size - 2) {
-            var path = splitPath[0]
-            for (j in 1..i) {
-                path += "$PATH_SEPARATOR${splitPath[j]}"
-            }
-            containerFolder = refreshFolder(path, accountName, metaFile.spaceId)
-        }
-        refreshFolder(remotePath, accountName, metaFile.spaceId)
-        return if (remotePath == ROOT_PATH) {
-            getFileByRemotePath(remotePath, accountName, metaFile.spaceId)
-        } else {
-            containerFolder.find { file ->
-                if (file.isFolder) {
-                    file.remotePath.dropLast(1)
-                } else {
-                    file.remotePath
-                } == remotePath
-            }
-        }
-    }
-
     override fun updateDownloadedFilesStorageDirectoryInStoragePath(oldDirectory: String, newDirectory: String) {
         localFileDataSource.updateDownloadedFilesStorageDirectoryInStoragePath(oldDirectory, newDirectory)
     }
diff --git a/owncloudData/src/test/java/com/owncloud/android/data/files/datasources/implementation/OCRemoteFileDataSourceTest.kt b/owncloudData/src/test/java/com/owncloud/android/data/files/datasources/implementation/OCRemoteFileDataSourceTest.kt
@@ -387,24 +387,19 @@ class OCRemoteFileDataSourceTest {
         every {
             ocFileService.getMetaFileInfo(
                 fileId = OC_FILE.remoteId!!,
-                isOcis = any()
             )
         } returns remoteResult
 
         val result = ocRemoteFileDataSource.getMetaFile(
             OC_FILE.remoteId!!,
             OC_ACCOUNT_NAME,
-            false,
         )
 
         assertEquals(REMOTE_META_FILE.toModel(), result)
 
         verify(exactly = 1) {
             clientManager.getFileService(OC_ACCOUNT_NAME)
-            ocFileService.getMetaFileInfo(
-                OC_FILE.remoteId!!,
-                false,
-            )
+            ocFileService.getMetaFileInfo(OC_FILE.remoteId!!)
         }
     }
 }
diff --git a/owncloudDomain/src/main/java/com/owncloud/android/domain/files/FileRepository.kt b/owncloudDomain/src/main/java/com/owncloud/android/domain/files/FileRepository.kt
@@ -39,6 +39,7 @@ interface FileRepository {
     fun getFileByIdAsFlow(fileId: Long): Flow<OCFile?>
     fun getFileWithSyncInfoByIdAsFlow(fileId: Long): Flow<OCFileWithSyncInfo?>
     fun getFileByRemotePath(remotePath: String, owner: String, spaceId: String? = null): OCFile?
+    fun getFileFromRemoteId(fileId: String, accountName: String): OCFile?
     fun getPersonalRootFolderForAccount(owner: String): OCFile
     fun getSharesRootFolderForAccount(owner: String): OCFile?
     fun getSearchFolderContent(fileListOption: FileListOption, folderId: Long, search: String): List<OCFile>
@@ -68,6 +69,4 @@ interface FileRepository {
     fun updateDownloadedFilesStorageDirectoryInStoragePath(oldDirectory: String, newDirectory: String)
     fun updateFileWithLastUsage(fileId: Long, lastUsage: Long?)
 
-    fun getFileFromRemoteId(fileId: String, accountName: String, isOcis: Boolean): OCFile?
-
 }
diff --git a/owncloudDomain/src/main/java/com/owncloud/android/domain/files/usecases/ManageDeepLinkUseCase.kt b/owncloudDomain/src/main/java/com/owncloud/android/domain/files/usecases/ManageDeepLinkUseCase.kt
@@ -21,7 +21,6 @@
 package com.owncloud.android.domain.files.usecases
 
 import com.owncloud.android.domain.BaseUseCaseWithResult
-import com.owncloud.android.domain.capabilities.usecases.GetStoredCapabilitiesUseCase
 import com.owncloud.android.domain.exceptions.DeepLinkException
 import com.owncloud.android.domain.files.FileRepository
 import com.owncloud.android.domain.files.model.OCFile
@@ -30,7 +29,6 @@ import java.net.URI
 
 class ManageDeepLinkUseCase(
     private val fileRepository: FileRepository,
-    private val getStoredCapabilitiesUseCase: GetStoredCapabilitiesUseCase,
 ) :
     BaseUseCaseWithResult<OCFile?, ManageDeepLinkUseCase.Params>() {
 
@@ -40,9 +38,8 @@ class ManageDeepLinkUseCase(
         if (pathParts[pathParts.size - 2] != DEEP_LINK_PREVIOUS_PATH_SEGMENT) {
             throw DeepLinkException()
         }
-        val capabilities = getStoredCapabilitiesUseCase(GetStoredCapabilitiesUseCase.Params(params.accountName))
 
-        return fileRepository.getFileFromRemoteId(pathParts[pathParts.size - 1], params.accountName, capabilities?.isSpacesAllowed() ?: false)
+        return fileRepository.getFileFromRemoteId(pathParts[pathParts.size - 1], params.accountName)
     }
 
     data class Params(val uri: URI, val accountName: String)

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,6 @@ interface FileService : Service {`
`87`	`87`
`88`	`88`	`fun getMetaFileInfo(`
`89`	`89`	`fileId: String,`
`90`		`- isOcis: Boolean`
`91`	`90`	`): RemoteOperationResult<RemoteMetaFile>`
`92`	`91`
`93`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,6 @@ interface RemoteFileDataSource {`
`94`	`94`	`fun getMetaFile(`
`95`	`95`	`fileId: String,`
`96`	`96`	`accountName: String,`
`97`		`- isOcis: Boolean`
`98`	`97`	`): OCMetaFile`
`99`	`98`
`100`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -387,24 +387,19 @@ class OCRemoteFileDataSourceTest {`
`387`	`387`	`every {`
`388`	`388`	`ocFileService.getMetaFileInfo(`
`389`	`389`	`fileId = OC_FILE.remoteId!!,`
`390`		`- isOcis = any()`
`391`	`390`	`)`
`392`	`391`	`} returns remoteResult`
`393`	`392`
`394`	`393`	`val result = ocRemoteFileDataSource.getMetaFile(`
`395`	`394`	`OC_FILE.remoteId!!,`
`396`	`395`	`OC_ACCOUNT_NAME,`
`397`		`- false,`
`398`	`396`	`)`
`399`	`397`
`400`	`398`	`assertEquals(REMOTE_META_FILE.toModel(), result)`
`401`	`399`
`402`	`400`	`verify(exactly = 1) {`
`403`	`401`	`clientManager.getFileService(OC_ACCOUNT_NAME)`
`404`		`- ocFileService.getMetaFileInfo(`
`405`		`- OC_FILE.remoteId!!,`
`406`		`- false,`
`407`		`- )`
	`402`	`+ ocFileService.getMetaFileInfo(OC_FILE.remoteId!!)`
`408`	`403`	`}`
`409`	`404`	`}`
`410`	`405`	`}`