Skip to content

Uploads: Make more resistent to network or OS issues #145

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
guruz wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −13
Open

Uploads: Make more resistent to network or OS issues #145

Show file tree
Hide file tree
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
8 changes: 6 additions & 2 deletions opencloudApp/src/main/java/eu/opencloud/android/workers/UploadFileFromContentUriWorker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ import eu.opencloud.android.domain.transfers.TransferRepository
import eu.opencloud.android.domain.transfers.model.OCTransfer
import eu.opencloud.android.domain.transfers.model.TransferResult
import eu.opencloud.android.domain.transfers.model.TransferStatus
import eu.opencloud.android.extensions.isContentUri
import eu.opencloud.android.extensions.parseError
import eu.opencloud.android.domain.capabilities.usecases.GetStoredCapabilitiesUseCase
import eu.opencloud.android.lib.common.OpenCloudAccount
Expand Down Expand Up @@ -142,7 +141,12 @@ class UploadFileFromContentUriWorker(
val localStorageProvider: LocalStorageProvider by inject()
cachePath = localStorageProvider.getTemporalPath(account.name, ocTransfer.spaceId) + uploadPath

if (ocTransfer.isContentUri(appContext)) {
// Re-copy if the cache file is missing or empty. A previous run may have copied it
// and then had it removed (e.g. by removeCacheFile() after a sibling worker for the
// same uploadPath completed). Without this, the PUT would go out against a stale or
// missing cache file. Only the contentUri from worker params is authoritative.
val cacheFile = File(cachePath)
if (!cacheFile.exists() || cacheFile.length() == 0L) {
checkDocumentFileExists()
checkPermissionsToReadDocumentAreGranted()
copyFileToLocalStorage()
Expand Down
20 changes: 9 additions & 11 deletions opencloudComLibrary/src/main/java/eu/opencloud/android/lib/common/network/FileRequestBody.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,26 +51,24 @@ open class FileRequestBody(
override fun contentLength(): Long = file.length()

override fun writeTo(sink: BufferedSink) {
val source: Source
var it: Iterator<OnDatatransferProgressListener>
try {
source = file.source()
var transferred: Long = 0
var read: Long
while (source.read(sink.buffer, BYTES_TO_READ).also { read = it } != -1L) {
// Don't swallow IO errors here — a missing source file used to silently produce
// a 0-byte PUT that the server happily stored (issue #78).
val source: Source = file.source()
var transferred: Long = 0
var read: Long
source.use { src ->
while (src.read(sink.buffer, BYTES_TO_READ).also { read = it } != -1L) {
transferred += read
sink.flush()
synchronized(dataTransferListeners) {
it = dataTransferListeners.iterator()
val it = dataTransferListeners.iterator()
while (it.hasNext()) {
it.next().onTransferProgress(read, transferred, file.length(), file.absolutePath)
}
}
}
Timber.d("File with name ${file.name} and size ${file.length()} written in request body")
} catch (e: Exception) {
Timber.e(e)
}
Timber.d("File with name ${file.name} and size ${file.length()} written in request body")
}

override fun addDatatransferProgressListener(listener: OnDatatransferProgressListener) {
Expand Down
Loading