mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-03-16 19:28:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

Minor formatting and clean up for ResultCall (#3684)

Browse source
This commit is contained in:
David Perez 2024-08-06 09:52:20 -05:00 • committed by GitHub
parent f110687e76
commit 02167024b1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 25 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/core/ResultCall.kt
View file

@ -9,7 +9,6 @@ import retrofit2.Call
import retrofit2.Callback
import retrofit2.HttpException
import retrofit2.Response
import retrofit2.Response.success
import java.lang.reflect.Type
/**
@ -23,58 +22,28 @@ class ResultCall<T>(
override fun clone(): Call<Result<T>> = ResultCall(backingCall, successType)
@Suppress("UNCHECKED_CAST")
private fun createResult(body: T?): Result<T> {
return when {
body != null -> body.asSuccess()
successType == Unit::class.java -> (Unit as T).asSuccess()
else -> IllegalStateException("Unexpected null body!").asFailure()
}
}
override fun enqueue(callback: Callback<Result<T>>): Unit = backingCall.enqueue(
object : Callback<T> {
override fun onResponse(call: Call<T>, response: Response<T>) {
val body = response.body()
val result: Result<T> = if (!response.isSuccessful) {
HttpException(response).asFailure()
} else {
createResult(body)
}
callback.onResponse(this@ResultCall, success(result))
callback.onResponse(this@ResultCall, Response.success(response.toResult()))
}
override fun onFailure(call: Call<T>, t: Throwable) {
val result: Result<T> = t.asFailure()
callback.onResponse(this@ResultCall, success(result))
callback.onResponse(this@ResultCall, Response.success(t.asFailure()))
}
},
)
/**
* Synchronously send the request and return its response as a [Result].
*/
fun executeForResult(): Result<T> = requireNotNull(execute().body())
@Suppress("TooGenericExceptionCaught")
override fun execute(): Response<Result<T>> {
val response = try {
backingCall.execute()
override fun execute(): Response<Result<T>> =
try {
Response.success(backingCall.execute().toResult())
} catch (ioException: IOException) {
return success(ioException.asFailure())
Response.success(ioException.asFailure())
} catch (runtimeException: RuntimeException) {
return success(runtimeException.asFailure())
Response.success(runtimeException.asFailure())
}
return success(
if (!response.isSuccessful) {
HttpException(response).asFailure()
} else {
createResult(response.body())
},
)
}
override fun isCanceled(): Boolean = backingCall.isCanceled
override fun isExecuted(): Boolean = backingCall.isExecuted
@ -82,4 +51,22 @@ class ResultCall<T>(
override fun request(): Request = backingCall.request()
override fun timeout(): Timeout = backingCall.timeout()
/**
* Synchronously send the request and return its response as a [Result].
*/
fun executeForResult(): Result<T> = requireNotNull(execute().body())
private fun Response<T>.toResult(): Result<T> =
if (!this.isSuccessful) {
HttpException(this).asFailure()
} else {
val body = this.body()
@Suppress("UNCHECKED_CAST")
when {
body != null -> body.asSuccess()
successType == Unit::class.java -> (Unit as T).asSuccess()
else -> IllegalStateException("Unexpected null body!").asFailure()
}
}
}