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

Changes from comments in Code Review

Browse Source
This commit is contained in:
masensio 2015-06-16 15:15:36 +02:00
parent dcad9157aa
commit 58deabb773
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
View File

@ -40,7 +40,6 @@ import com.owncloud.android.lib.common.network.ChunkFromFileChannelRequestEntity
import com.owncloud.android.lib.common.network.ProgressiveDataTransferer; import com.owncloud.android.lib.common.network.ProgressiveDataTransferer;
import com.owncloud.android.lib.common.network.WebdavUtils; import com.owncloud.android.lib.common.network.WebdavUtils;
import com.owncloud.android.lib.common.operations.InvalidCharacterExceptionParser; import com.owncloud.android.lib.common.operations.InvalidCharacterExceptionParser;
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.lib.common.utils.Log_OC;
@ -88,9 +87,9 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
mPutMethod.setRequestEntity(mEntity); mPutMethod.setRequestEntity(mEntity);
status = client.executeMethod(mPutMethod); status = client.executeMethod(mPutMethod);
// TODO: Detect INVALID_CHARACTER_DETECT_IN SERVER in a better way? if (status == 400) {
if (status == 400 || status == 500) { InvalidCharacterExceptionParser xmlParser =
InvalidCharacterExceptionParser xmlParser = new InvalidCharacterExceptionParser(); new InvalidCharacterExceptionParser();
InputStream is = new ByteArrayInputStream( InputStream is = new ByteArrayInputStream(
mPutMethod.getResponseBodyAsString().getBytes()); mPutMethod.getResponseBodyAsString().getBytes());
try { try {

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

@ -94,7 +94,6 @@ public class UploadRemoteFileOperation extends RemoteOperation {
} }
int status = uploadFile(client); int status = uploadFile(client);
// TODO: Detect INVALID_CHARACTER_DETECT_IN SERVER in a better way?
if (mForbiddenCharsInServer){ if (mForbiddenCharsInServer){
result = new RemoteOperationResult( result = new RemoteOperationResult(
RemoteOperationResult.ResultCode.INVALID_CHARACTER_DETECT_IN_SERVER); RemoteOperationResult.ResultCode.INVALID_CHARACTER_DETECT_IN_SERVER);
@ -132,8 +131,7 @@ public class UploadRemoteFileOperation extends RemoteOperation {
mPutMethod.setRequestEntity(mEntity); mPutMethod.setRequestEntity(mEntity);
status = client.executeMethod(mPutMethod); status = client.executeMethod(mPutMethod);
// TODO: Detect INVALID_CHARACTER_DETECT_IN SERVER in a better way? if (status == 400) {
if (status == 400 || status == 500) {
InvalidCharacterExceptionParser xmlParser = new InvalidCharacterExceptionParser(); InvalidCharacterExceptionParser xmlParser = new InvalidCharacterExceptionParser();
InputStream is = new ByteArrayInputStream( InputStream is = new ByteArrayInputStream(
mPutMethod.getResponseBodyAsString().getBytes()); mPutMethod.getResponseBodyAsString().getBytes());