Fix handling network errors when reading body of response with unsuccessful HTTP status code

Author: equeim

rpc/src/main/kotlin/org/equeim/tremotesf/rpc/OkHttpCallback.kt

@@ -48,24 +48,24 @@ internal class OkHttpCallback<ResponseArguments : Any>(
                 if (response.isSuccessful) Log.DEBUG else Log.ERROR,
                 "Received response headers for RPC request with $context: status is ${response.status}"
             )
-            if (!response.isSuccessful) {
-                resumeWithException(
-                    when (response.code) {
-                        HttpURLConnection.HTTP_UNAUTHORIZED -> RpcRequestError.AuthenticationError(
-                            response,
-                            requestHeaders
-                        )
-
-                        else -> RpcRequestError.UnsuccessfulHttpStatusCode(
-                            response = response,
-                            responseBody = body?.string(),
-                            requestHeaders = requestHeaders
-                        )
-                    }
-                )
-                return
-            }
             try {
+                if (!response.isSuccessful) {
+                    resumeWithException(
+                        when (response.code) {
+                            HttpURLConnection.HTTP_UNAUTHORIZED -> RpcRequestError.AuthenticationError(
+                                response,
+                                requestHeaders
+                            )
+
+                            else -> RpcRequestError.UnsuccessfulHttpStatusCode(
+                                response = response,
+                                responseBody = body.string(),
+                                requestHeaders = requestHeaders
+                            )
+                        }
+                    )
+                    return
+                }
                 if (body.contentLength() == 0L) {
                     throw SerializationException("Response does not have a body")
                 }

rpc/src/test/kotlin/org/equeim/tremotesf/rpc/RpcClientTest.kt

@@ -184,6 +184,22 @@ class RpcClientTest {
         assertThrows<RpcRequestError.NetworkError> { client.getSessionStats() }
     }
 
+    @ParameterizedTest
+    @ValueSource(booleans = [true, false])
+    fun `Check connection error when reading response body on http status code error`(errorDuringValidation: Boolean) =
+        runTest {
+            if (!errorDuringValidation) {
+                enqueueSuccessfulValidation()
+            }
+            server.enqueue(
+                MockResponse.Builder()
+                    .code(HttpURLConnection.HTTP_INTERNAL_ERROR)
+                    .body("lol")
+                    .onResponseBody(SocketEffect.ShutdownConnection).build()
+            )
+            assertThrows<RpcRequestError.NetworkError> { client.getSessionStats() }
+        }
+
     @ParameterizedTest
     @ValueSource(booleans = [true, false])
     fun `Check http status code error`(errorDuringValidation: Boolean) = runTest {