ProtonMail
/
protoncore_android
mirror of https://github.com/ProtonMail/protoncore_android
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Logging improvements of API errors

This commit is contained in:
Mateusz Markowicz 2020-07-15 12:55:08 +02:00
parent 081dddef31
commit ce61c97a70
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
network/data/src/main/kotlin/me/proton/core/network/data/ApiResultUtils.kt
View File

@ -37,9 +37,9 @@ internal suspend fun <Api, T> safeApiCall(
val result = try {
ApiResult.Success(block(api))
} catch (e: ProtonErrorException) {
parseHttpError(e.response, e.protonData)
parseHttpError(e.response, e.protonData, e)
} catch (e: HttpException) {
parseHttpError(e.response()!!.raw(), null)
parseHttpError(e.response()!!.raw(), null, e)
} catch (e: SerializationException) {
ApiResult.Error.Parse(e)
} catch (e: CertificateException) {
@ -56,16 +56,20 @@ internal suspend fun <Api, T> safeApiCall(
return result
}
private fun <T> parseHttpError(response: Response, protonData: ApiResult.Error.ProtonData?): ApiResult<T> {
private fun <T> parseHttpError(
response: Response,
protonData: ApiResult.Error.ProtonData?,
cause: Exception
): ApiResult<T> {
val retryAfter = response.headers["Retry-After"]?.toIntOrNull()
return if (response.code == ApiResult.HTTP_TOO_MANY_REQUESTS && retryAfter != null) {
ApiResult.Error.TooManyRequest(retryAfter, protonData)
} else {
ApiResult.Error.Http(response.code, response.message, protonData)
ApiResult.Error.Http(response.code, response.message, protonData, cause)
}
}
internal class ProtonErrorException(
internal data class ProtonErrorException(
val response: Response,
val protonData: ApiResult.Error.ProtonData
) : IOException()

12
network/domain/src/main/kotlin/me/proton/core/network/domain/ApiResult.kt
View File

@ -19,7 +19,7 @@ package me.proton.core.network.domain
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.withTimeoutOrNull
import java.lang.Exception
import kotlin.Exception
/**
* Result of the safe API call.
@ -51,8 +51,14 @@ sealed class ApiResult<out T> {
* @property message HTTP message.
* @property proton Proton-specific HTTP error data.
*/
open class Http(val httpCode: Int, val message: String, val proton: ProtonData? = null) : Error(null)
class ProtonData(val code: Int, val error: String)
open class Http(
val httpCode: Int,
val message: String,
val proton: ProtonData? = null,
cause: Exception? = null
) : Error(cause)
data class ProtonData(val code: Int, val error: String)
/**
* Parsing error. Should not normally happen.