flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-07 16:06:08 +00:00
Code Issues Releases Wiki Activity

Abort uploads with no chunking working

Browse Source
This commit is contained in:
davigonz 2018-06-19 17:58:10 +02:00
parent 804b31da39
commit 45e4b98510
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/owncloud/android/lib/common/network/FileRequestBody.java
View File

@ -57,6 +57,11 @@ public class FileRequestBody extends RequestBody implements ProgressiveDataTrans
return mContentType; return mContentType;
} }
@Override
public long contentLength() {
return mFile.length();
}
@Override @Override
public void writeTo(BufferedSink sink) { public void writeTo(BufferedSink sink) {
Source source; Source source;

10
src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
View File

@ -36,14 +36,11 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import okhttp3.MediaType; import okhttp3.MediaType;
import okhttp3.MultipartBody;
import okhttp3.RequestBody;
import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK; 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); mPutMethod.addRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER, mFileLastModifTimestamp);
RequestBody requestBody = new MultipartBody.Builder() mPutMethod.setRequestBody(mFileRequestBody);
.setType(MultipartBody.FORM)
.addPart(mFileRequestBody)
.build();
mPutMethod.setRequestBody(requestBody);
int status = client.executeHttpMethod(mPutMethod); int status = client.executeHttpMethod(mPutMethod);