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

Unverified Commit 4367c710 authored by David Luhmer's avatar David Luhmer Committed by GitHub
Browse files

Merge pull request #287 from nextcloud/fix-retrofit-network-on-main-thread 

Fix NetworkOnMainThreadException when using ResponseBody
parents 23efd4ce 3aaa412b

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

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ public class NextcloudRetrofitServiceMethod<T> { 


                // Streaming

                if(typeArgument == ResponseBody.class) {

                    return (T) Observable.just(Okhttp3Helper.getResponseBodyFromRequest(nextcloudAPI, request));

                    return (T) Observable.fromCallable(() -> Okhttp3Helper.getResponseBodyFromRequest(nextcloudAPI, request));

                } else if (typeArgument instanceof ParameterizedType) {

                    ParameterizedType innerType = (ParameterizedType) typeArgument;

                    Type innerOwnerType = innerType.getRawType();

src/test/java/com/nextcloud/android/sso/api/TestRetrofitAPI.java

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ public class TestRetrofitAPI { 
        //);





        mApi.getStreamingUpdatedItems(1000, 1000, 1000);

        mApi.getStreamingUpdatedItems(1000, 1000, 1000).blockingSubscribe();



        HashMap<String, String> expectedParams = new HashMap<>();

        expectedParams.put("lastModified", "1000");

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

+2 −2

File changed.

Contains only whitespace changes.