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

Fix transition when base URL is actually incorrect (#196)

Browse Source
This commit is contained in:
Kirill Kamakin
2024-01-13 12:18:12 +01:00
committed by GitHub
parent 4c6e480737
commit c8f1f477cc
12 changed files with 54 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/gq/kirmanak/mealient/data/baseurl/ServerInfoRepo.kt
View File

@@ -1,5 +1,6 @@
package gq.kirmanak.mealient.data.baseurl
import gq.kirmanak.mealient.datasource.models.VersionResponse
import kotlinx.coroutines.flow.Flow
interface ServerInfoRepo {
@@ -8,7 +9,7 @@ interface ServerInfoRepo {
suspend fun getUrl(): String?
suspend fun tryBaseURL(baseURL: String): Result<Unit>
suspend fun tryBaseURL(baseURL: String): Result<VersionResponse>
}

18
app/src/main/java/gq/kirmanak/mealient/data/baseurl/ServerInfoRepoImpl.kt
View File

@@ -1,6 +1,7 @@
package gq.kirmanak.mealient.data.baseurl
import gq.kirmanak.mealient.datasource.ServerUrlProvider
import gq.kirmanak.mealient.datasource.models.VersionResponse
import gq.kirmanak.mealient.logging.Logger
import kotlinx.coroutines.flow.Flow
import javax.inject.Inject
@@ -20,18 +21,11 @@ class ServerInfoRepoImpl @Inject constructor(
return result
}
override suspend fun tryBaseURL(baseURL: String): Result<Unit> {
val oldBaseUrl = serverInfoStorage.getBaseURL()
serverInfoStorage.storeBaseURL(baseURL)
try {
versionDataSource.requestVersion()
} catch (e: Throwable) {
serverInfoStorage.storeBaseURL(oldBaseUrl)
return Result.failure(e)
override suspend fun tryBaseURL(baseURL: String): Result<VersionResponse> {
return versionDataSource.runCatching {
requestVersion(baseURL)
}.onSuccess {
serverInfoStorage.storeBaseURL(baseURL)
}
return Result.success(Unit)
}
}

2
app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionDataSource.kt
View File

@@ -4,5 +4,5 @@ import gq.kirmanak.mealient.datasource.models.VersionResponse
interface VersionDataSource {
suspend fun requestVersion(): VersionResponse
suspend fun requestVersion(baseURL: String): VersionResponse
}

4
app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionDataSourceImpl.kt
View File

@@ -8,7 +8,7 @@ class VersionDataSourceImpl @Inject constructor(
private val dataSource: MealieDataSource,
) : VersionDataSource {
override suspend fun requestVersion(): VersionResponse {
return dataSource.getVersionInfo()
override suspend fun requestVersion(baseURL: String): VersionResponse {
return dataSource.getVersionInfo(baseURL)
}
}

2
app/src/main/java/gq/kirmanak/mealient/ui/baseurl/BaseURLViewModel.kt
View File

@@ -77,7 +77,7 @@ internal class BaseURLViewModel @Inject constructor(
return
}
val result: Result<Unit> = serverInfoRepo.tryBaseURL(url).recoverCatching {
val result = serverInfoRepo.tryBaseURL(url).recoverCatching {
logger.e(it) { "checkBaseURL: trying to recover, had prefix = $hasPrefix" }
val certificateError = it.findCauseAsInstanceOf<CertificateCombinedException>()
if (certificateError != null) {