add ability to get a parsed response including headers via Retrofit (32dde70e) · Commits · e / os / Android SingleSignOn

src/main/java/com/nextcloud/android/sso/api/NextcloudAPI.java

+23 −3

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import com.google.gson.Gson;
		import com.nextcloud.android.sso.aidl.NextcloudRequest;
		import com.nextcloud.android.sso.model.SingleSignOnAccount;

		import java.io.IOException;
		import java.io.InputStream;
		import java.io.InputStreamReader;
		import java.io.Reader;
		@@ -91,14 +92,33 @@ public class NextcloudAPI {
		});
		}

		public <T> Observable<ParsedResponse<T>> performRequestObservableV2(final Type type, final NextcloudRequest request) {
		return Observable.fromPublisher( s-> {
		try {
		Response response = performRequestV2(type, request);

		s.onNext(new ParsedResponse<>(convertStreamToTargetEntity(response.getBody(), type), response.getPlainHeaders()));
		s.onComplete();
		} catch (Exception e) {
		s.onError(e);
		}
		});
		}

		public <T> T performRequest(final @NonNull Type type, NextcloudRequest request) throws Exception {
		Log.d(TAG, "performRequest() called with: type = [" + type + "], request = [" + request + "]");

		T result = convertStreamToTargetEntity(performNetworkRequest(request), type);

		return result;
		}

		private <T> T convertStreamToTargetEntity(InputStream inputStream, Type targetEntity) throws IOException {
		T result = null;
		try (InputStream os = performNetworkRequest(request);
		try (InputStream os = inputStream;
		Reader targetReader = new InputStreamReader(os)) {
		if (type != Void.class) {
		result = gson.fromJson(targetReader, type);
		if (targetEntity != Void.class) {
		result = gson.fromJson(targetReader, targetEntity);
		if (result != null) {
		Log.d(TAG, result.toString());
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -179,6 +179,12 @@ public class NextcloudRetrofitServiceMethod<T> {
		// Streaming
		if(typeArgument == ResponseBody.class) {
		return (T) Observable.just(Okhttp3Helper.getResponseBodyFromRequest(nextcloudAPI, request));
		} else if (typeArgument instanceof ParameterizedType) {
		ParameterizedType innerType = (ParameterizedType) returnType;
		Type innerOwnerType = type.getRawType();
		if(innerOwnerType == ParsedResponse.class) {
		return (T) nextcloudAPI.performRequestObservableV2(innerType.getActualTypeArguments()[0], request);
		}
		} else {
		return (T) nextcloudAPI.performRequestObservable(typeArgument, request);
		}

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		package com.nextcloud.android.sso.api;

		import java.util.ArrayList;
		import java.util.HashMap;
		import java.util.Map;

		public class ParsedResponse <T> {
		private T response;
		private Map<String, String> headers = new HashMap<>();

		public ParsedResponse(T response, ArrayList<AidlNetworkRequest.PlainHeader> headers) {
		this.response = response;
		for (AidlNetworkRequest.PlainHeader header : headers) {
		this.headers.put(header.getName(), header.getValue());
		}
		}

		public T getResponse() {
		return response;
		}

		public Map<String, String> getHeaders() {
		return headers;
		}
		}