From ae8bceacba1f1b6076e3fc7fb1cd7e0da7ece3b1 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 25 Sep 2019 10:58:55 +0200
Subject: [PATCH] Create Extension to convert a Response to a Failure -> expose
 to other object

---
 .../android/internal/network/Request.kt       | 35 ------------
 .../internal/network/RetrofitExtensions.kt    | 54 ++++++++++++++++++-
 2 files changed, 52 insertions(+), 37 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/Request.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/Request.kt
index 3420717199..a333a02c67 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/Request.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/Request.kt
@@ -16,24 +16,15 @@
 
 package im.vector.matrix.android.internal.network
 
-import com.squareup.moshi.JsonDataException
-import com.squareup.moshi.Moshi
-import im.vector.matrix.android.api.failure.ConsentNotGivenError
 import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.failure.MatrixError
-import im.vector.matrix.android.internal.di.MoshiProvider
 import kotlinx.coroutines.CancellationException
-import org.greenrobot.eventbus.EventBus
 import retrofit2.Call
-import retrofit2.Response
-import timber.log.Timber
 import java.io.IOException
 
 internal suspend inline fun <DATA> executeRequest(block: Request<DATA>.() -> Unit) = Request<DATA>().apply(block).execute()
 
 internal class Request<DATA> {
 
-    private val moshi: Moshi = MoshiProvider.providesMoshi()
     lateinit var apiCall: Call<DATA>
 
     suspend fun execute(): DATA {
@@ -55,30 +46,4 @@ internal class Request<DATA> {
             }
         }
     }
-
-    private fun <T> Response<T>.toFailure(): Failure {
-        val errorBody = errorBody() ?: return Failure.Unknown(RuntimeException("errorBody() should not be null"))
-
-        val errorBodyStr = errorBody.string()
-
-        val matrixErrorAdapter = moshi.adapter(MatrixError::class.java)
-
-        try {
-            val matrixError = matrixErrorAdapter.fromJson(errorBodyStr)
-
-            if (matrixError != null) {
-                if (matrixError.code == MatrixError.M_CONSENT_NOT_GIVEN && !matrixError.consentUri.isNullOrBlank()) {
-                    // Also send this error to the bus, for a global management
-                    EventBus.getDefault().post(ConsentNotGivenError(matrixError.consentUri))
-                }
-
-                return Failure.ServerError(matrixError, code())
-            }
-        } catch (ex: JsonDataException) {
-            // This is not a MatrixError
-            Timber.w("The error returned by the server is not a MatrixError")
-        }
-
-        return Failure.OtherServerError(errorBodyStr, code())
-    }
 }
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/RetrofitExtensions.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/RetrofitExtensions.kt
index 824d74b30e..64fcb08bac 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/RetrofitExtensions.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/RetrofitExtensions.kt
@@ -18,14 +18,22 @@
 
 package im.vector.matrix.android.internal.network
 
+import com.squareup.moshi.JsonDataException
+import im.vector.matrix.android.api.failure.ConsentNotGivenError
+import im.vector.matrix.android.api.failure.Failure
+import im.vector.matrix.android.api.failure.MatrixError
+import im.vector.matrix.android.internal.di.MoshiProvider
 import kotlinx.coroutines.suspendCancellableCoroutine
+import okhttp3.ResponseBody
+import org.greenrobot.eventbus.EventBus
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
+import timber.log.Timber
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 
-suspend fun <T> Call<T>.awaitResponse(): Response<T> {
+internal suspend fun <T> Call<T>.awaitResponse(): Response<T> {
     return suspendCancellableCoroutine { continuation ->
         continuation.invokeOnCancellation {
             cancel()
@@ -40,4 +48,46 @@ suspend fun <T> Call<T>.awaitResponse(): Response<T> {
             }
         })
     }
-}
\ No newline at end of file
+}
+
+/**
+ * Convert a retrofit Response to a Failure, and eventually parse errorBody to convert it to a MatrixError
+ */
+internal fun <T> Response<T>.toFailure(): Failure {
+    return toFailure(errorBody(), code())
+}
+
+/**
+ * Convert a okhttp3 Response to a Failure, and eventually parse errorBody to convert it to a MatrixError
+ */
+internal fun okhttp3.Response.toFailure(): Failure {
+    return toFailure(body(), code())
+}
+
+private fun toFailure(errorBody: ResponseBody?, httpCode: Int): Failure {
+    if (errorBody == null) {
+        return Failure.Unknown(RuntimeException("errorBody should not be null"))
+    }
+
+    val errorBodyStr = errorBody.string()
+
+    val matrixErrorAdapter = MoshiProvider.providesMoshi().adapter(MatrixError::class.java)
+
+    try {
+        val matrixError = matrixErrorAdapter.fromJson(errorBodyStr)
+
+        if (matrixError != null) {
+            if (matrixError.code == MatrixError.M_CONSENT_NOT_GIVEN && !matrixError.consentUri.isNullOrBlank()) {
+                // Also send this error to the bus, for a global management
+                EventBus.getDefault().post(ConsentNotGivenError(matrixError.consentUri))
+            }
+
+            return Failure.ServerError(matrixError, httpCode)
+        }
+    } catch (ex: JsonDataException) {
+        // This is not a MatrixError
+        Timber.w("The error returned by the server is not a MatrixError")
+    }
+
+    return Failure.OtherServerError(errorBodyStr, httpCode)
+}