arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-06-28 10:52:35 +00:00
Code Issues Releases Wiki Activity

Journalmanager: always use the api error message when available.

Browse Source
This commit is contained in:
Tom Hacohen 2017-04-19 11:13:10 +01:00
parent 6579ac8cf1
commit da87d14ae9
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/etesync/syncadapter/journalmanager/BaseManager.java
View File

@ -35,20 +35,22 @@ abstract class BaseManager {
}
if (!response.isSuccessful()) {
ApiError apiError = GsonHelper.gson.fromJson(response.body().charStream(), ApiError.class);
switch (response.code()) {
case HttpURLConnection.HTTP_UNAVAILABLE:
throw new Exceptions.ServiceUnavailableException(response, "Service unavailable");
case HttpURLConnection.HTTP_UNAUTHORIZED:
throw new Exceptions.UnauthorizedException(response, "Unauthorized auth token");
case HttpURLConnection.HTTP_FORBIDDEN:
ApiError apiError = GsonHelper.gson.fromJson(response.body().charStream(), ApiError.class);
if (apiError.code.equals("service_inactive")) {
throw new Exceptions.UserInactiveException(response, apiError.detail);
}
default:
// Fall through. We want to always throw when unsuccessful.
}
throw new Exceptions.HttpException(response);
throw new Exceptions.HttpException(response, apiError.detail);
}
return response;

5
app/src/main/java/com/etesync/syncadapter/journalmanager/Exceptions.java
View File

@ -143,6 +143,11 @@ public class Exceptions {
this.response = formatted.toString();
}
@Override
public String getMessage() {
return message;
}
private static void appendByte(StringBuilder formatted, byte b) {
if (b == '\r')
formatted.append("[CR]");