Merge pull request #45 from Omega-R/develop

New release 1.4.3

Author: anton-knyazev

core/build.gradle

@@ -59,14 +59,14 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${kotlinCorutines_version}"
     implementation "org.jetbrains.kotlin:kotlin-android-extensions-runtime:${kotlin_version}"
 
-    api 'com.github.Omega-R.OmegaMoxy:moxy:2.2.0'
-    api 'com.github.Omega-R.OmegaMoxy:moxy-androidx:2.2.0'
-    api 'com.github.Omega-R.OmegaMoxy:moxy-ktx:2.2.0'
-    kapt 'com.github.Omega-R.OmegaMoxy:moxy-compiler:2.2.0'
+    api 'com.github.Omega-R.OmegaMoxy:moxy:2.2.1'
+    api 'com.github.Omega-R.OmegaMoxy:moxy-androidx:2.2.1'
+    api 'com.github.Omega-R.OmegaMoxy:moxy-ktx:2.2.1'
+    kapt 'com.github.Omega-R.OmegaMoxy:moxy-compiler:2.2.1'
 
 
     api "com.github.Omega-R.OmegaRecyclerView:omegarecyclerview:${omegaRecyclerView}@aar"
-    api 'com.github.Omega-R.OmegaTypes:glide:2.0.3'
+    api 'com.github.Omega-R.OmegaTypes:glide:2.1.0'
     api 'com.github.Omega-R.OmegaIntentBuilder:core:1.3.3'
     api 'com.github.Omega-R:OmegaLaunchers:1.0.3'
     api 'com.github.Omega-R:OmegaExtensions:1.0.5'

core/src/main/java/com/omega_r/base/data/OmegaBaseRepository.kt

@@ -311,10 +311,7 @@ open class OmegaBaseRepository<SOURCE : Source>(
 
     private suspend fun <R> ProducerScope<R>.applyMock(block: suspend SOURCE.() -> R) {
         if (mockSource != null) {
-            getException {
-                send(block(mockSource))
-                return
-            }
+            send(block(mockSource))
         }
     }
 

core/src/main/java/com/omega_r/base/errors/ErrorHandler.kt

@@ -2,8 +2,14 @@ package com.omega_r.base.errors
 
 import kotlinx.coroutines.CoroutineExceptionHandler
 import retrofit2.HttpException
+import retrofit2.Invocation
 import java.net.ConnectException
-import java.net.HttpURLConnection.*
+import java.net.HttpURLConnection.HTTP_BAD_REQUEST
+import java.net.HttpURLConnection.HTTP_FORBIDDEN
+import java.net.HttpURLConnection.HTTP_INTERNAL_ERROR
+import java.net.HttpURLConnection.HTTP_NOT_FOUND
+import java.net.HttpURLConnection.HTTP_UNAUTHORIZED
+import java.net.HttpURLConnection.HTTP_UNAVAILABLE
 import java.net.SocketTimeoutException
 import java.net.UnknownHostException
 import kotlin.coroutines.CoroutineContext
@@ -16,19 +22,24 @@ open class ErrorHandler : (Throwable) -> Exception, CoroutineExceptionHandler {
     override val key: CoroutineContext.Key<*>
         get() = CoroutineExceptionHandler
 
-    protected open fun handleHttpException(httpException: HttpException): AppException {
+    protected open fun handleHttpException(httpException: HttpException, method: String?): AppException {
         val response = httpException.response()
 
         when (response?.code()) {
             HTTP_INTERNAL_ERROR -> return AppException.ServerProblem(
-                "Internal server error",
+                "Internal server error\n$method",
                 httpException
             )
-            HTTP_BAD_REQUEST -> return AppException.ServerProblem("Bad request", httpException)
-            HTTP_UNAVAILABLE -> return AppException.ServerProblem("Service Unavailable", httpException)
-            HTTP_NOT_FOUND -> return AppException.NotFound("Not found", httpException)
-            HTTP_FORBIDDEN -> return AppException.AccessDenied("Forbidden", httpException)
-            HTTP_UNAUTHORIZED-> return AppException.NotAuthorized("Unauthorized", httpException)
+            HTTP_BAD_REQUEST -> return AppException.ServerProblem("Bad request\n" +
+                    "$method", httpException)
+            HTTP_UNAVAILABLE -> return AppException.ServerProblem("Service Unavailable\n" +
+                    "$method", httpException)
+            HTTP_NOT_FOUND -> return AppException.NotFound("Not found\n" +
+                    "$method", httpException)
+            HTTP_FORBIDDEN -> return AppException.AccessDenied("Forbidden\n" +
+                    "$method", httpException)
+            HTTP_UNAUTHORIZED-> return AppException.NotAuthorized("Unauthorized\n" +
+                    "$method", httpException)
         }
 
         return AppException.UnknownError("Unknown error type", httpException)
@@ -39,12 +50,27 @@ open class ErrorHandler : (Throwable) -> Exception, CoroutineExceptionHandler {
             is UnknownHostException -> AppException.NoConnection(null, throwable)
             is ConnectException,
             is SocketTimeoutException -> AppException.ServerUnavailable(null, throwable)
-            is HttpException -> handleHttpException(throwable)
+            is HttpException -> {
+                handleHttpException(throwable, throwable.getMethod())
+            }
             is AppException -> throwable
             else -> AppException.UnknownError("Unknown error", throwable)
         }
     }
 
+    protected open fun HttpException.getMethod(): String? {
+        return response()?.raw()?.request()?.let {
+            var result = "@" + it.method() + "(" + it.url().url().toString() + ") "
+
+            it.tag(Invocation::class.java)?.let { tag ->
+                val arguments = tag.arguments().joinToString()
+                result += tag.method().declaringClass.simpleName + "." + tag.method().name + "(" + arguments + ")"
+            }
+
+            result
+        }
+    }
+
     override fun handleException(context: CoroutineContext, exception: Throwable) {
         throw handleThrowable(exception)
     }