Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Syncing a file from an external app via cloud storage doesn't work #1441

Merged
merged 3 commits into from
Oct 1, 2024
+17 −4
Merged

fix: Syncing a file from an external app via cloud storage doesn't work #1441

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2440e35
fix: Don't keep the old cache file
sirambd Sep 30, 2024
eb999e2
fix: Cloud storage metadata is out of date
sirambd Sep 30, 2024
06c88ed
refactor: Simplify getRemoteFile
sirambd Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions app/src/main/java/com/infomaniak/drive/data/documentprovider/CloudStorageProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,17 +258,28 @@ class CloudStorageProvider : DocumentsProvider() {
SentryLog.d(TAG, "openDocument(), id=$documentId, mode=$mode, signalIsCancelled: ${signal?.isCanceled}")
val context = context ?: return null

fun getRemoteFile(localFile: File?, fileId: Int, driveId: Int): File? {
val okHttpClient = runBlocking { AccountUtils.getHttpClient(getUserId(documentId).toInt()) }
return ApiRepository.getFileDetails(localFile ?: File(id = fileId, driveId = driveId), okHttpClient).data
}

val isWrite = mode.indexOf('w') != -1
val accessMode = ParcelFileDescriptor.parseMode(mode)
val fileId = getFileIdFromDocumentId(documentId)
val userDrive = createUserDrive(documentId)
val file = FileController.getFileById(fileId, userDrive)
val localFile = FileController.getFileById(fileId, userDrive)

return file?.let {
val updatedFile = runCatching {
getRemoteFile(localFile, fileId, userDrive.driveId)
}.getOrElse {
localFile
}

return updatedFile?.let {
if (isWrite) {
writeDataFile(context, file, userDrive, accessMode)
writeDataFile(context, updatedFile, userDrive, accessMode)
} else {
getDataFile(context, file, userDrive, accessMode)
getDataFile(context, updatedFile, userDrive, accessMode)
}
}
}
Expand Down Expand Up @@ -552,6 +563,7 @@ class CloudStorageProvider : DocumentsProvider() {

private fun writeDataFile(context: Context, file: File, userDrive: UserDrive, accessMode: Int): ParcelFileDescriptor? {
val tempFile = createTempFile(file.parentId, file.name)
val cacheFile = file.getCacheFile(context, userDrive)
val handler = Handler(context.mainLooper)

return ParcelFileDescriptor.open(tempFile, accessMode, handler) { exception: IOException? ->
Expand All @@ -568,6 +580,7 @@ class CloudStorageProvider : DocumentsProvider() {
userId = userDrive.userId,
).store()
context.syncImmediately()
cacheFile.delete() // Delete old cache
}
} else {
exception.printStackTrace()
Expand Down
Loading