From 16c91473834c52e1493cb39c38654930e20b42a3 Mon Sep 17 00:00:00 2001 From: masensio Date: Wed, 3 Jun 2015 00:32:19 +0200 Subject: [PATCH] Parse and show the error of invalid characters coming from the server side: Move, Rename, Uploads --- .../operations/RemoteOperationResult.java | 10 ++++----- .../ChunkedUploadRemoteFileOperation.java | 17 +++++++++----- .../files/MoveRemoteFileOperation.java | 22 +++++++++++-------- .../files/RenameRemoteFileOperation.java | 20 ++++++++++------- .../files/UploadRemoteFileOperation.java | 15 +++++++++---- 5 files changed, 51 insertions(+), 33 deletions(-) diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java index 89848ac9..2d9d957f 100644 --- a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java +++ b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java @@ -42,7 +42,6 @@ import org.apache.commons.httpclient.HttpException; import org.apache.commons.httpclient.HttpStatus; import org.apache.jackrabbit.webdav.DavException; import org.json.JSONException; -import org.xmlpull.v1.XmlPullParserException; import android.accounts.Account; import android.accounts.AccountsException; @@ -50,7 +49,6 @@ import android.accounts.AccountsException; import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException; import com.owncloud.android.lib.common.network.CertificateCombinedException; import com.owncloud.android.lib.common.utils.Log_OC; -import com.owncloud.android.lib.resources.shares.ShareXMLParser; /** @@ -64,10 +62,10 @@ import com.owncloud.android.lib.resources.shares.ShareXMLParser; public class RemoteOperationResult implements Serializable { /** Generated - should be refreshed every time the class changes!! */; - private static final long serialVersionUID = -9003837206000993465L; - - private static final String TAG = "RemoteOperationResult"; - + private static final long serialVersionUID = -4184015692120731701L; + + private static final String TAG = RemoteOperationResult.class.getSimpleName(); + public enum ResultCode { OK, OK_SSL, diff --git a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java index 15284adb..1ae71bd8 100644 --- a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java +++ b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java @@ -46,7 +46,7 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation private static final String OC_CHUNKED_HEADER = "OC-Chunked"; private static final String TAG = ChunkedUploadRemoteFileOperation.class.getSimpleName(); - public ChunkedUploadRemoteFileOperation(String storagePath, String remotePath, String mimeType) { + public ChunkedUploadRemoteFileOperation(String storagePath, String remotePath, String mimeType){ super(storagePath, remotePath, mimeType); } @@ -61,17 +61,21 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation raf = new RandomAccessFile(file, "r"); channel = raf.getChannel(); mEntity = new ChunkFromFileChannelRequestEntity(channel, mMimeType, CHUNK_SIZE, file); - //((ProgressiveDataTransferer)mEntity).addDatatransferProgressListeners(getDataTransferListeners()); + //((ProgressiveDataTransferer)mEntity). + // addDatatransferProgressListeners(getDataTransferListeners()); synchronized (mDataTransferListeners) { - ((ProgressiveDataTransferer)mEntity).addDatatransferProgressListeners(mDataTransferListeners); + ((ProgressiveDataTransferer)mEntity) + .addDatatransferProgressListeners(mDataTransferListeners); } long offset = 0; - String uriPrefix = client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath) + "-chunking-" + Math.abs((new Random()).nextInt(9000)+1000) + "-" ; + String uriPrefix = client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath) + + "-chunking-" + Math.abs((new Random()).nextInt(9000)+1000) + "-" ; long chunkCount = (long) Math.ceil((double)file.length() / CHUNK_SIZE); for (int chunkIndex = 0; chunkIndex < chunkCount ; chunkIndex++, offset += CHUNK_SIZE) { if (mPutMethod != null) { - mPutMethod.releaseConnection(); // let the connection available for other methods + mPutMethod.releaseConnection(); // let the connection available + // for other methods } mPutMethod = new PutMethod(uriPrefix + chunkCount + "-" + chunkIndex); mPutMethod.addRequestHeader(OC_CHUNKED_HEADER, OC_CHUNKED_HEADER); @@ -80,7 +84,8 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation mPutMethod.setRequestEntity(mEntity); status = client.executeMethod(mPutMethod); client.exhaustResponse(mPutMethod.getResponseBodyAsStream()); - Log_OC.d(TAG, "Upload of " + mLocalPath + " to " + mRemotePath + ", chunk index " + chunkIndex + ", count " + chunkCount + ", HTTP result status " + status); + Log_OC.d(TAG, "Upload of " + mLocalPath + " to " + mRemotePath + ", chunk index " + + chunkIndex + ", count " + chunkCount + ", HTTP result status " + status); if (!isSuccess(status)) break; } diff --git a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java index f1535eb1..c2fb651a 100644 --- a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java +++ b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java @@ -39,6 +39,7 @@ import com.owncloud.android.lib.common.network.WebdavUtils; import com.owncloud.android.lib.common.operations.RemoteOperation; import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.common.utils.Log_OC; /** @@ -129,15 +130,18 @@ public class MoveRemoteFileOperation extends RemoteOperation { /// for other errors that could be explicitly handled, check first: /// http://www.webdav.org/specs/rfc4918.html#rfc.section.9.9.4 - } else { - - result = new RemoteOperationResult( - isSuccess(status), // move.succeeded()? trustful? - status, - move.getResponseHeaders() - ); - client.exhaustResponse(move.getResponseBodyAsStream()); - } + } else if (status == 400) { + result = new RemoteOperationResult(move.succeeded(), + move.getResponseBodyAsString(), status); + Log_OC.d(TAG, move.getResponseBodyAsString()); + } else { + result = new RemoteOperationResult( + isSuccess(status), // move.succeeded()? trustful? + status, + move.getResponseHeaders() + ); + client.exhaustResponse(move.getResponseBodyAsStream()); + } Log.i(TAG, "Move " + mSrcRemotePath + " to " + mTargetRemotePath + ": " + result.getLogMessage()); diff --git a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java index fa928b7c..7f449560 100644 --- a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java +++ b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java @@ -94,11 +94,9 @@ public class RenameRemoteFileOperation extends RemoteOperation { if (noInvalidChars) { try { - if (mNewName.equals(mOldName)) { return new RemoteOperationResult(ResultCode.OK); } - // check if a file with the new name already exists if (client.existsFile(mNewRemotePath)) { @@ -109,12 +107,18 @@ public class RenameRemoteFileOperation extends RemoteOperation { WebdavUtils.encodePath(mOldRemotePath), client.getWebdavUri() + WebdavUtils.encodePath(mNewRemotePath)); int status = client.executeMethod(move, RENAME_READ_TIMEOUT, RENAME_CONNECTION_TIMEOUT); - - move.getResponseBodyAsString(); // exhaust response, although not interesting - result = new RemoteOperationResult(move.succeeded(), status, move.getResponseHeaders()); - Log_OC.i(TAG, "Rename " + mOldRemotePath + " to " + mNewRemotePath + ": " + - result.getLogMessage()); - + + if (status == 400) { + result = new RemoteOperationResult(move.succeeded(), + move.getResponseBodyAsString(), status); + Log_OC.d(TAG, move.getResponseBodyAsString()); + } else { + move.getResponseBodyAsString(); // exhaust response, although not interesting + result = new RemoteOperationResult(move.succeeded(), status, + move.getResponseHeaders()); + Log_OC.i(TAG, "Rename " + mOldRemotePath + " to " + mNewRemotePath + ": " + + result.getLogMessage()); + } } catch (Exception e) { result = new RemoteOperationResult(e); Log_OC.e(TAG, "Rename " + mOldRemotePath + " to " + diff --git a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java index 9043fe36..e3b2ff63 100644 --- a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java +++ b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java @@ -43,6 +43,7 @@ import com.owncloud.android.lib.common.network.WebdavUtils; import com.owncloud.android.lib.common.operations.OperationCancelledException; import com.owncloud.android.lib.common.operations.RemoteOperation; import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.utils.Log_OC; /** * Remote operation performing the upload of a remote file to the ownCloud server. @@ -53,6 +54,8 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult; public class UploadRemoteFileOperation extends RemoteOperation { + private static final String TAG = UploadRemoteFileOperation.class.getSimpleName(); + protected static final String OC_TOTAL_LENGTH_HEADER = "OC-Total-Length"; protected String mLocalPath; @@ -87,10 +90,14 @@ public class UploadRemoteFileOperation extends RemoteOperation { } int status = uploadFile(client); - - result = new RemoteOperationResult(isSuccess(status), status, - (mPutMethod != null ? mPutMethod.getResponseHeaders() : null)); - + if (status == 400) { + result = new RemoteOperationResult(isSuccess(status), + mPutMethod.getResponseBodyAsString(), status); + Log_OC.d(TAG, mPutMethod.getResponseBodyAsString()); + } else { + result = new RemoteOperationResult(isSuccess(status), status, + (mPutMethod != null ? mPutMethod.getResponseHeaders() : null)); + } } catch (Exception e) { // TODO something cleaner with cancellations if (mCancellationRequested.get()) {