Skip to content

feat: enable auto-sync for file access via Storage Access Framework (SAF). #89

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

Open
edo-bari-ikutsu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: enable auto-sync for file access via Storage Access Framework (SAF). #89

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 25 additions & 23 deletions ...main/java/eu/opencloud/android/presentation/documentsprovider/DocumentsStorageProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ import eu.opencloud.android.presentation.documentsprovider.cursors.SpaceCursor
import eu.opencloud.android.presentation.settings.security.SettingsSecurityFragment.Companion.PREFERENCE_LOCK_ACCESS_FROM_DOCUMENT_PROVIDER
import eu.opencloud.android.usecases.synchronization.SynchronizeFileUseCase
import eu.opencloud.android.usecases.synchronization.SynchronizeFolderUseCase
import eu.opencloud.android.usecases.transfers.downloads.DownloadFileUseCase
import eu.opencloud.android.usecases.transfers.uploads.UploadFilesFromSystemUseCase
import eu.opencloud.android.utils.FileStorageUtils
import eu.opencloud.android.utils.NotificationUtils
Expand Down Expand Up @@ -107,11 +106,8 @@ class DocumentsStorageProvider : DocumentsProvider() {
if (!uploadOnly) {
ocFile = getFileByIdOrException(documentId.toInt())

if (!ocFile.isAvailableLocally) {
val downloadFileUseCase: DownloadFileUseCase by inject()

downloadFileUseCase(DownloadFileUseCase.Params(accountName = ocFile.owner, file = ocFile))

if (!ocFile.isAvailableLocally || !isWrite) {
syncFileWithServer(ocFile)
do {
if (!waitOrGetCancelled(signal)) {
return null
Expand Down Expand Up @@ -150,23 +146,7 @@ class DocumentsStorageProvider : DocumentsProvider() {
uploadFilesUseCase(uploadFilesUseCaseParams)
}
} else {
Thread {
val synchronizeFileUseCase: SynchronizeFileUseCase by inject()
val result = synchronizeFileUseCase(
SynchronizeFileUseCase.Params(
fileToSynchronize = ocFile,
)
)
Timber.d("Synced ${ocFile.remotePath} from ${ocFile.owner} with result: $result")
if (result.getDataOrNull() is SynchronizeFileUseCase.SyncType.ConflictDetected) {
context?.let {
NotificationUtils.notifyConflict(
fileInConflict = ocFile,
context = it
)
}
}
}.start()
syncFileWithServer(ocFile)
}
}
} catch (e: IOException) {
Expand Down Expand Up @@ -488,6 +468,28 @@ class DocumentsStorageProvider : DocumentsProvider() {
return NONEXISTENT_DOCUMENT_ID
}

private fun syncFileWithServer(fileToSync: OCFile) {
Timber.d("Trying to sync a file ${fileToSync.id} with server")

val synchronizeFileUseCase : SynchronizeFileUseCase by inject()
val synchronizeFileUseCaseParam = SynchronizeFileUseCase.Params(
fileToSynchronize = fileToSync
)
CoroutineScope(Dispatchers.IO).launch {
val useCaseResult = synchronizeFileUseCase(synchronizeFileUseCaseParam)
Timber.d("${fileToSync.remotePath} from ${fileToSync.owner} was synced with server with result: $useCaseResult")

if (useCaseResult.getDataOrNull() is SynchronizeFileUseCase.SyncType.ConflictDetected) {
context?.let {
NotificationUtils.notifyConflict(
fileInConflict = fileToSync,
context = it
)
}
}
}
}

private fun syncDirectoryWithServer(parentDocumentId: String) {
Timber.d("Trying to sync $parentDocumentId with server")
val folderToSync = getFileByIdOrException(parentDocumentId.toInt())
Expand Down