Remove v1 version from v0 data source

2022-10-29 16:50:13 +02:00
parent 1f5234d123
commit da33bc2730
2 changed files with 13 additions and 16 deletions
--- a/app/src/main/java/gq/kirmanak/mealient/data/network/MealieDataSourceWrapper.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/data/network/MealieDataSourceWrapper.kt
@@ -29,7 +29,15 @@ class MealieDataSourceWrapper @Inject constructor(
        withAuthHeader { token -> mealieDataSource.addRecipe(getUrl(), token, recipe) }

    override suspend fun getVersionInfo(baseUrl: String): VersionInfo =
-        mealieDataSource.getVersionInfo(baseUrl).toVersionInfo()
+        runCatchingExceptCancel {
+            mealieDataSource.getVersionInfo(baseUrl).toVersionInfo()
+        }.getOrElse {
+            if (it is NetworkError.NotMealie) {
+                mealieDataSourceV1.getVersionInfo(baseUrl).toVersionInfo()
+            } else {
+                throw it
+            }
+        }

    override suspend fun requestRecipes(start: Int, limit: Int): List<GetRecipeSummaryResponseV1> =
        withAuthHeader { token ->