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

Handle specific bad request error

Browse Source
This commit is contained in:
davigonz 2019-09-23 09:32:04 +02:00
parent 495e3321e2
commit 8ba4fa5960
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
View File

@ -188,8 +188,12 @@ public class RemoteOperationResult<T>
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<T>
* @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<T>
SERVICE_UNAVAILABLE,
SPECIFIC_SERVICE_UNAVAILABLE,
SPECIFIC_UNSUPPORTED_MEDIA_TYPE,
SPECIFIC_METHOD_NOT_ALLOWED
SPECIFIC_METHOD_NOT_ALLOWED,
SPECIFIC_BAD_REQUEST
}
}

2
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/FileUtils.java
View File

@ -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;
}