atridad/Mealient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fix sending duplicate requests

Browse Source
This commit is contained in:
Kirill Kamakin
2022-10-29 19:22:54 +02:00
parent b2ff374cef
commit 5c5bfdedd3
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/gq/kirmanak/mealient/data/network/MealieDataSourceWrapper.kt
View File

@@ -11,6 +11,7 @@ import gq.kirmanak.mealient.datasource.NetworkError
import gq.kirmanak.mealient.datasource.v0.MealieDataSourceV0 import gq.kirmanak.mealient.datasource.v0.MealieDataSourceV0
import gq.kirmanak.mealient.datasource.v0.models.AddRecipeRequestV0 import gq.kirmanak.mealient.datasource.v0.models.AddRecipeRequestV0
import gq.kirmanak.mealient.datasource.v1.MealieDataSourceV1 import gq.kirmanak.mealient.datasource.v1.MealieDataSourceV1
import gq.kirmanak.mealient.extensions.runCatchingExceptCancel
import gq.kirmanak.mealient.extensions.toFullRecipeInfo import gq.kirmanak.mealient.extensions.toFullRecipeInfo
import gq.kirmanak.mealient.extensions.toRecipeSummaryInfo import gq.kirmanak.mealient.extensions.toRecipeSummaryInfo
import javax.inject.Inject import javax.inject.Inject
@@ -29,8 +30,7 @@ class MealieDataSourceWrapper @Inject constructor(
} }
override suspend fun requestRecipes( override suspend fun requestRecipes(
start: Int, start: Int, limit: Int
limit: Int
): List<RecipeSummaryInfo> = withAuthHeader { token -> ): List<RecipeSummaryInfo> = withAuthHeader { token ->
val url = getUrl() val url = getUrl()
when (getVersion()) { when (getVersion()) {
@@ -57,14 +57,17 @@ class MealieDataSourceWrapper @Inject constructor(
private suspend fun getVersion() = serverInfoRepo.getVersion() private suspend fun getVersion() = serverInfoRepo.getVersion()
private suspend inline fun <T> withAuthHeader(block: (String?) -> T): T = private suspend inline fun <T> withAuthHeader(block: (String?) -> T): T {
runCatching { block(authRepo.getAuthHeader()) }.getOrElse { val authHeader = authRepo.getAuthHeader()
return runCatchingExceptCancel { block(authHeader) }.getOrElse {
if (it is NetworkError.Unauthorized) { if (it is NetworkError.Unauthorized) {
authRepo.invalidateAuthHeader() authRepo.invalidateAuthHeader()
// Trying again with new authentication header // Trying again with new authentication header
block(authRepo.getAuthHeader()) val newHeader = authRepo.getAuthHeader()
if (newHeader == authHeader) throw it else block(newHeader)
} else { } else {
throw it throw it
} }
} }
} }
}