AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix create or add a vault using shortcuts from Shared Drives location

Browse Source 
Fixes #431
This commit is contained in:
Julian Raufelder 2022-04-08 22:45:42 +02:00
parent 7e201ba289
commit 50c781690d
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveImpl.kt
View File

@ -56,7 +56,7 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
@Throws(IOException::class) @Throws(IOException::class)
private fun findFile(parentDriveId: String?, name: String): File? { private fun findFile(parentDriveId: String?, name: String): File? {
val fileListQuery = client().files().list().setFields("files(id,mimeType,name,size,shortcutDetails)") val fileListQuery = client().files().list().setFields("files(id,mimeType,name,size,shortcutDetails)").setSupportsAllDrives(true).setIncludeItemsFromAllDrives(true)
fileListQuery.q = "name contains '$name' and '$parentDriveId' in parents and trashed = false" fileListQuery.q = "name contains '$name' and '$parentDriveId' in parents and trashed = false"
return fileListQuery.execute().files.firstOrNull { it.name == name } return fileListQuery.execute().files.firstOrNull { it.name == name }
} }
@ -131,6 +131,8 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
.setFields("nextPageToken,files(id,mimeType,modifiedTime,name,size,shortcutDetails)") // .setFields("nextPageToken,files(id,mimeType,modifiedTime,name,size,shortcutDetails)") //
.setPageSize(1000) // .setPageSize(1000) //
.setPageToken(pageToken) .setPageToken(pageToken)
.setSupportsAllDrives(true)
.setIncludeItemsFromAllDrives(true)
fileListQuery.q = "'" + folder.driveId + "' in parents and trashed = false" fileListQuery.q = "'" + folder.driveId + "' in parents and trashed = false"
val fileList = fileListQuery.execute() val fileList = fileListQuery.execute()
for (file in fileList.files) { for (file in fileList.files) {
@ -160,6 +162,7 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
.files() // .files() //
.create(metadata) // .create(metadata) //
.setFields("id,name") // .setFields("id,name") //
.setSupportsAllDrives(true) //
.execute() .execute()
return idCache.cache(GoogleDriveCloudNodeFactory.folder(parentFolder, createdFolder)) return idCache.cache(GoogleDriveCloudNodeFactory.folder(parentFolder, createdFolder))
} ?: throw ParentFolderIsNullException(folder.name) } ?: throw ParentFolderIsNullException(folder.name)
@ -181,6 +184,7 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
.setFields("id,mimeType,modifiedTime,name,size") // .setFields("id,mimeType,modifiedTime,name,size") //
.setAddParents(targetsParent.driveId) // .setAddParents(targetsParent.driveId) //
.setRemoveParents(sourcesParent.driveId) // .setRemoveParents(sourcesParent.driveId) //
.setSupportsAllDrives(true) //
.execute() .execute()
idCache.remove(source) idCache.remove(source)
return idCache.cache(GoogleDriveCloudNodeFactory.from(targetsParent, movedFile)) return idCache.cache(GoogleDriveCloudNodeFactory.from(targetsParent, movedFile))
@ -224,6 +228,7 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
.files() // .files() //
.update(file.driveId, metadata, it) // .update(file.driveId, metadata, it) //
.setFields("id,modifiedTime,name,size") // .setFields("id,modifiedTime,name,size") //
.setSupportsAllDrives(true) //
.execute() .execute()
} }
} }
@ -246,6 +251,7 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
.files() // .files() //
.create(metadata, it) // .create(metadata, it) //
.setFields("id,modifiedTime,name,size") // .setFields("id,modifiedTime,name,size") //
.setSupportsAllDrives(true) //
.execute() .execute()
} }
} }
@ -316,6 +322,7 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
client() // client() //
.files()[file.driveId] // .files()[file.driveId] //
.setAlt("media") // .setAlt("media") //
.setSupportsAllDrives(true) //
.executeMediaAndDownloadTo(it) .executeMediaAndDownloadTo(it)
} }
} catch (e: HttpResponseException) { } catch (e: HttpResponseException) {
@ -373,7 +380,7 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
@Throws(IOException::class) @Throws(IOException::class)
fun delete(node: GoogleDriveNode) { fun delete(node: GoogleDriveNode) {
client().files().delete(node.driveId).execute() client().files().delete(node.driveId).setSupportsAllDrives(true).execute()
idCache.remove(node) idCache.remove(node)
} }