From 45e4b98510524faa7584fc1bcc2961aa8eed0d7e Mon Sep 17 00:00:00 2001 From: davigonz Date: Tue, 19 Jun 2018 17:58:10 +0200 Subject: [PATCH] Abort uploads with no chunking working --- .../android/lib/common/network/FileRequestBody.java | 5 +++++ .../lib/resources/files/UploadRemoteFileOperation.java | 10 +--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/com/owncloud/android/lib/common/network/FileRequestBody.java b/src/com/owncloud/android/lib/common/network/FileRequestBody.java index cd938562..9c4b30ac 100644 --- a/src/com/owncloud/android/lib/common/network/FileRequestBody.java +++ b/src/com/owncloud/android/lib/common/network/FileRequestBody.java @@ -57,6 +57,11 @@ public class FileRequestBody extends RequestBody implements ProgressiveDataTrans return mContentType; } + @Override + public long contentLength() { + return mFile.length(); + } + @Override public void writeTo(BufferedSink sink) { Source source; diff --git a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java index 5f2c5933..6683af46 100644 --- a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java +++ b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java @@ -36,14 +36,11 @@ import com.owncloud.android.lib.common.operations.RemoteOperation; import com.owncloud.android.lib.common.operations.RemoteOperationResult; import java.io.File; -import java.io.IOException; import java.util.HashSet; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import okhttp3.MediaType; -import okhttp3.MultipartBody; -import okhttp3.RequestBody; import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK; @@ -149,12 +146,7 @@ public class UploadRemoteFileOperation extends RemoteOperation { mPutMethod.addRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER, mFileLastModifTimestamp); - RequestBody requestBody = new MultipartBody.Builder() - .setType(MultipartBody.FORM) - .addPart(mFileRequestBody) - .build(); - - mPutMethod.setRequestBody(requestBody); + mPutMethod.setRequestBody(mFileRequestBody); int status = client.executeHttpMethod(mPutMethod);