From 48b6c0521dbc5bca4a178f53975b3c745e800a13 Mon Sep 17 00:00:00 2001 From: desperateCoder Date: Sat, 8 Aug 2020 14:20:08 +0200 Subject: [PATCH 1/2] fix file uploads vor networkRequests V2 Signed-off-by: desperateCoder --- src/main/java/com/nextcloud/android/sso/api/NextcloudAPI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/nextcloud/android/sso/api/NextcloudAPI.java b/src/main/java/com/nextcloud/android/sso/api/NextcloudAPI.java index e57a82e5..dc5b22fb 100644 --- a/src/main/java/com/nextcloud/android/sso/api/NextcloudAPI.java +++ b/src/main/java/com/nextcloud/android/sso/api/NextcloudAPI.java @@ -165,7 +165,7 @@ public InputStream performNetworkRequest(NextcloudRequest request) throws Except * @throws Exception or SSOException */ public Response performNetworkRequestV2(NextcloudRequest request) throws Exception { - return networkRequest.performNetworkRequestV2(request, null); + return networkRequest.performNetworkRequestV2(request, request.getBodyAsStream()); } protected Gson getGson() { From 7d0b95ebf1ba979870abca02cea16d0c7187d772 Mon Sep 17 00:00:00 2001 From: desperateCoder Date: Sat, 15 Aug 2020 17:15:44 +0200 Subject: [PATCH 2/2] improved null handling Signed-off-by: desperateCoder --- .../com/nextcloud/android/sso/api/NextcloudAPI.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/nextcloud/android/sso/api/NextcloudAPI.java b/src/main/java/com/nextcloud/android/sso/api/NextcloudAPI.java index dc5b22fb..ce6439ae 100644 --- a/src/main/java/com/nextcloud/android/sso/api/NextcloudAPI.java +++ b/src/main/java/com/nextcloud/android/sso/api/NextcloudAPI.java @@ -133,11 +133,14 @@ private T convertStreamToTargetEntity(InputStream inputStream, Type targetEn Reader targetReader = new InputStreamReader(os)) { if (targetEntity != Void.class) { result = gson.fromJson(targetReader, targetEntity); - /* - if (result != null) { - Log.d(TAG, result.toString()); + if (result == null) { + if (targetEntity == Object.class) { + return (T) NOTHING; + } else { + throw new IllegalStateException("Could not instantiate \"" + + targetEntity.toString() + "\", because response was null."); + } } - */ } else { result = (T) NOTHING; }