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

Open a remote folder that does not exist in realm #829

Merged
merged 2 commits into from
Jun 30, 2022
Merged

Open a remote folder that does not exist in realm #829

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b22f573
Open a remote folder that does not exist in realm
sirambd Jun 29, 2022
24d4b9c
Apply suggestions from code review
KevinBoulongne Jun 30, 2022
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
40 changes: 27 additions & 13 deletions app/src/main/java/com/infomaniak/drive/data/cache/FileController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ object FileController {
|| minDateToIgnoreCache >= folderProxy.responseAt

if (needToDownload && !ignoreCloud) {
result = downloadAndSaveFiles(
result = realm.downloadAndSaveFiles(
localFolderProxy = folderProxy,
order = order,
page = page,
Expand All @@ -649,7 +649,7 @@ object FileController {
.findAll()
}

private fun downloadAndSaveFiles(
private fun Realm.downloadAndSaveFiles(
localFolderProxy: File?,
order: SortType,
page: Int,
Expand All @@ -667,11 +667,13 @@ object FileController {

val apiResponse = ApiRepository.getDirectoryFiles(okHttpClient, driveId, parentId, page, order)
val localFolder = localFolderProxy?.realm?.copyFromRealm(localFolderProxy, 1)
?: ApiRepository.getFileDetails(File(id = parentId, driveId = driveId)).data

if (apiResponse.isSuccess()) {
apiResponse.data?.let { remoteFiles ->
saveRemoteFiles(localFolderProxy, apiResponse, page)
result = (localFolder!! to if (withChildren) ArrayList(remoteFiles) else arrayListOf())
val remoteFiles = apiResponse.data
if (remoteFiles != null && localFolder != null) {
saveRemoteFiles(localFolderProxy, localFolder, apiResponse, page)
result = (localFolder to if (withChildren) ArrayList(remoteFiles) else arrayListOf())
}
} else if (page == 1 && localFolderProxy != null) {
val localSortedFolderFiles = if (withChildren) getLocalSortedFolderFiles(localFolderProxy, order) else arrayListOf()
Expand All @@ -680,21 +682,33 @@ object FileController {
return result
}

private fun saveRemoteFiles(localFolderProxy: File?, apiResponse: ApiResponse<List<File>>, page: Int) {
private fun Realm.saveRemoteFiles(
localFolderProxy: File?,
remoteFolder: File?,
apiResponse: ApiResponse<List<File>>,
page: Int
KevinBoulongne marked this conversation as resolved.
Show resolved Hide resolved
) {
val remoteFiles = apiResponse.data!!

// Save remote folder if doesn't exists locally
KevinBoulongne marked this conversation as resolved.
Show resolved Hide resolved
var newLocalFolderProxy: File? = null
if (localFolderProxy == null && remoteFolder != null) {
executeTransaction { newLocalFolderProxy = copyToRealm(remoteFolder) }
}

// Restore same children data
keepSubFolderChildren(localFolderProxy?.children, remoteFiles)
// Save to realm
localFolderProxy?.let {
it.realm.executeTransaction {
(localFolderProxy ?: newLocalFolderProxy)?.let { folderProxy ->
executeTransaction {
// Remove old children
if (page == 1) localFolderProxy.children.clear()
if (page == 1) folderProxy.children.clear()
// Add children
localFolderProxy.children.addAll(remoteFiles)
folderProxy.children.addAll(remoteFiles)
// Update folder properties
if (remoteFiles.size < ApiRepository.PER_PAGE) localFolderProxy.isComplete = true
localFolderProxy.responseAt = apiResponse.responseAt
localFolderProxy.versionCode = BuildConfig.VERSION_CODE
if (remoteFiles.size < ApiRepository.PER_PAGE) folderProxy.isComplete = true
folderProxy.responseAt = apiResponse.responseAt
folderProxy.versionCode = BuildConfig.VERSION_CODE
}
}
}
Expand Down