Tweak response.body()

Goooler · Dec 21, 2023 · 2a0b56c · 2a0b56c
1 parent 76b2b67
commit 2a0b56c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/retrofit/src/main/java/retrofit2/ResultCallAdapterFactory.kt b/retrofit/src/main/java/retrofit2/ResultCallAdapterFactory.kt
@@ -44,7 +44,8 @@ class ResultCall<T>(private val delegate: Call<T>) : Call<Result<T>> {
     delegate.enqueue(object : Callback<T> {
       override fun onResponse(call: Call<T>, response: Response<T>) {
         val result = if (response.isSuccessful) {
-          Result.success(response.body()!!)
+          val body = response.body() ?: error("Response body is null")
+          Result.success(body)
         } else {
           Result.failure(HttpException(response))
         }
@@ -61,7 +62,8 @@ class ResultCall<T>(private val delegate: Call<T>) : Call<Result<T>> {
     return try {
       val response = delegate.execute()
       val result = if (response.isSuccessful) {
-        Result.success(response.body()!!)
+        val body = response.body() ?: error("Response body is null")
+        Result.success(body)
       } else {
         Result.failure(IOException("Unexpected error: ${response.errorBody()?.string()}"))
       }