github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-06-02 02:36:58 -05:00
Code Issues 1.8k Packages Projects Releases 126 Wiki Activity

Apply result extension consistently (#1210)

Browse Source
This commit is contained in:
David Perez
2024-04-02 13:55:38 -05:00
committed by Álison Fernandes
parent 0561879d6b
commit 663c9785cf
13 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
package com.x8bit.bitwarden.data.platform.datasource.network.core
import com.x8bit.bitwarden.data.platform.util.asFailure
import com.x8bit.bitwarden.data.platform.util.asSuccess
import okhttp3.Request
import okio.IOException
import okio.Timeout
@@ -25,9 +26,9 @@ class ResultCall<T>(
@Suppress("UNCHECKED_CAST")
private fun createResult(body: T?): Result<T> {
return when {
body != null -> Result.success(body)
successType == Unit::class.java -> Result.success(Unit as T)
else -> Result.failure(IllegalStateException("Unexpected null body!"))
body != null -> body.asSuccess()
successType == Unit::class.java -> (Unit as T).asSuccess()
else -> IllegalStateException("Unexpected null body!").asFailure()
}
}
@@ -36,7 +37,7 @@ class ResultCall<T>(
override fun onResponse(call: Call<T>, response: Response<T>) {
val body = response.body()
val result: Result<T> = if (!response.isSuccessful) {
Result.failure(HttpException(response))
HttpException(response).asFailure()
} else {
createResult(body)
}
@@ -44,7 +45,7 @@ class ResultCall<T>(
}
override fun onFailure(call: Call<T>, t: Throwable) {
val result: Result<T> = Result.failure(t)
val result: Result<T> = t.asFailure()
callback.onResponse(this@ResultCall, success(result))
}
},

2
app/src/main/java/com/x8bit/bitwarden/data/platform/util/ResultExtensions.kt
View File

@@ -9,7 +9,7 @@ import kotlinx.coroutines.coroutineScope
*/
inline fun <T, R> Result<T>.flatMap(transform: (T) -> Result<R>): Result<R> =
this.exceptionOrNull()
?.let { Result.failure(it) }
?.asFailure()
?: transform(this.getOrThrow())
/**