Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a2603a0 authored by David Luhmer's avatar David Luhmer Committed by David Luhmer
Browse files

some more refactoring

parent 6b722ee3
Loading
Loading
Loading
Loading
+15 −11
Original line number Diff line number Diff line
@@ -55,18 +55,9 @@ public final class Retrofit2Helper {
                    T body = nextcloudAPI.performRequestV2(resType, nextcloudRequest);
                    return Response.success(body);
                } catch (NextcloudHttpRequestFailedException e) {
                    ResponseBody body = ResponseBody.create(null, e.getCause().getMessage());
                    return Response.error(
                            body,
                            new okhttp3.Response.Builder()
                                    .body(body)
                                    .code(e.getStatusCode())
                                    .message(e.getCause().getMessage())
                                    .protocol(Protocol.HTTP_1_1)
                                    .request(new Request.Builder().url("http://localhost/" + nextcloudRequest.getUrl()).build())
                                    .build());
                    return convertExceptionToResponse(e.getStatusCode(), e.getCause().getMessage());
                } catch (Exception e) {
                    return Response.error(520, ResponseBody.create(null, e.toString()));
                    return convertExceptionToResponse(520, e.toString());
                }
            }

@@ -110,6 +101,19 @@ public final class Retrofit2Helper {
            public Request request() {
                throw new UnsupportedOperationException("Not implemented");
            }

            private Response<T> convertExceptionToResponse(int statusCode, String errorMessage) {
                ResponseBody body = ResponseBody.create(null, errorMessage);
                return Response.error(
                        body,
                        new okhttp3.Response.Builder()
                                .body(body)
                                .code(statusCode)
                                .message(errorMessage)
                                .protocol(Protocol.HTTP_1_1)
                                .request(new Request.Builder().url("http://localhost/" + nextcloudRequest.getUrl()).build())
                                .build());
            }
        };
    }