diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperationResult.java index db86e6b8..eacb4e69 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperationResult.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperationResult.java @@ -188,8 +188,12 @@ public class RemoteOperationResult try { if (xmlParser.parseXMLResponse(is)) { mCode = ResultCode.INVALID_CHARACTER_DETECT_IN_SERVER; + } else { + parseErrorMessageAndSetCode( + httpMethod.getResponseBodyAsString(), + ResultCode.SPECIFIC_BAD_REQUEST + ); } - } catch (Exception e) { Timber.w("Error reading exception from server: %s", e.getMessage()); // mCode stays as set in this(success, httpCode, headers) @@ -305,13 +309,12 @@ public class RemoteOperationResult * @param resultCode our own custom result code */ private void parseErrorMessageAndSetCode(String bodyResponse, ResultCode resultCode) { - if (bodyResponse != null && bodyResponse.length() > 0) { InputStream is = new ByteArrayInputStream(bodyResponse.getBytes()); ErrorMessageParser xmlParser = new ErrorMessageParser(); try { String errorMessage = xmlParser.parseXMLResponse(is); - if (errorMessage != null && !errorMessage.equals("")) { + if (!errorMessage.equals("")) { mCode = resultCode; mHttpPhrase = errorMessage; } @@ -566,6 +569,7 @@ public class RemoteOperationResult SERVICE_UNAVAILABLE, SPECIFIC_SERVICE_UNAVAILABLE, SPECIFIC_UNSUPPORTED_MEDIA_TYPE, - SPECIFIC_METHOD_NOT_ALLOWED + SPECIFIC_METHOD_NOT_ALLOWED, + SPECIFIC_BAD_REQUEST } } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/FileUtils.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/FileUtils.java index 0fb8248a..8a6c9f67 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/FileUtils.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/FileUtils.java @@ -77,7 +77,7 @@ public class FileUtils { public static boolean isValidName(String fileName) { boolean result = true; - Log_OC.d(TAG, "fileName =======" + fileName); + Timber.d("fileName =======%s", fileName); if (fileName.contains(PATH_SEPARATOR)) { result = false; }