From 8f068a284952a1efff937141c929b33562b03292 Mon Sep 17 00:00:00 2001 From: masensio Date: Thu, 9 Apr 2015 18:19:22 +0200 Subject: [PATCH 1/3] Add OC-Total-Length header to ChunkedUploadRemoteFileOperation --- .../lib/resources/files/ChunkedUploadRemoteFileOperation.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java index 89379dda..3b20e388 100644 --- a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java +++ b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java @@ -44,6 +44,7 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation public static final long CHUNK_SIZE = 1024000; private static final String OC_CHUNKED_HEADER = "OC-Chunked"; + private static final String OC_TOTAL_LENGTH_HEADER = "OC-Total-Length"; private static final String TAG = ChunkedUploadRemoteFileOperation.class.getSimpleName(); public ChunkedUploadRemoteFileOperation(String storagePath, String remotePath, String mimeType) { @@ -75,7 +76,8 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation } mPutMethod = new PutMethod(uriPrefix + chunkCount + "-" + chunkIndex); mPutMethod.addRequestHeader(OC_CHUNKED_HEADER, OC_CHUNKED_HEADER); - ((ChunkFromFileChannelRequestEntity)mEntity).setOffset(offset); + mPutMethod.addRequestHeader(OC_TOTAL_LENGTH_HEADER, String.valueOf(file.length())); + ((ChunkFromFileChannelRequestEntity) mEntity).setOffset(offset); mPutMethod.setRequestEntity(mEntity); status = client.executeMethod(mPutMethod); client.exhaustResponse(mPutMethod.getResponseBodyAsStream()); From aaebdefe563575bc890038a82ecabc730d5dcc65 Mon Sep 17 00:00:00 2001 From: masensio Date: Fri, 10 Apr 2015 09:21:05 +0200 Subject: [PATCH 2/3] Add OC-Total-Length to UploadRemoteFileOperation --- .../lib/resources/files/ChunkedUploadRemoteFileOperation.java | 1 - .../android/lib/resources/files/UploadRemoteFileOperation.java | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java index 3b20e388..15284adb 100644 --- a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java +++ b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java @@ -44,7 +44,6 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation public static final long CHUNK_SIZE = 1024000; private static final String OC_CHUNKED_HEADER = "OC-Chunked"; - private static final String OC_TOTAL_LENGTH_HEADER = "OC-Total-Length"; private static final String TAG = ChunkedUploadRemoteFileOperation.class.getSimpleName(); public ChunkedUploadRemoteFileOperation(String storagePath, String remotePath, String mimeType) { diff --git a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java index 9514431a..9043fe36 100644 --- a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java +++ b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java @@ -53,6 +53,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult; public class UploadRemoteFileOperation extends RemoteOperation { + protected static final String OC_TOTAL_LENGTH_HEADER = "OC-Total-Length"; protected String mLocalPath; protected String mRemotePath; @@ -116,6 +117,7 @@ public class UploadRemoteFileOperation extends RemoteOperation { ((ProgressiveDataTransferer)mEntity) .addDatatransferProgressListeners(mDataTransferListeners); } + mPutMethod.addRequestHeader(OC_TOTAL_LENGTH_HEADER, String.valueOf(f.length())); mPutMethod.setRequestEntity(mEntity); status = client.executeMethod(mPutMethod); client.exhaustResponse(mPutMethod.getResponseBodyAsStream()); From ddb8648809b7e5c91ec6d081ccdb0597dbebd520 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Wed, 15 Apr 2015 12:49:45 +0200 Subject: [PATCH 3/3] Added version for OC accounts --- .../android/lib/common/accounts/AccountUtils.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java index be7bafab..02a12bd8 100644 --- a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java +++ b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java @@ -350,12 +350,18 @@ public class AccountUtils { public static final String KEY_SUPPORTS_SAML_WEB_SSO = "oc_supports_saml_web_sso"; /** * Flag signaling if the ownCloud server supports Share API" - */ + * @deprecated + */ public static final String KEY_SUPPORTS_SHARE_API = "oc_supports_share_api"; /** - * OC accout cookies + * OC account cookies */ public static final String KEY_COOKIES = "oc_account_cookies"; - } + + /** + * OC account version + */ + public static final String KEY_OC_ACCOUNT_VERSION = "oc_account_version"; + } }