Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: RunCatching network exceptions #110

Merged
merged 3 commits into from
Dec 4, 2024
Merged

fix: RunCatching network exceptions #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3bcfd0
refactor: Update AppSettingsDB space
sirambd Dec 4, 2024
17fd931
fix: Handle all request call exceptions
sirambd Dec 4, 2024
efb96ee
fix: Handle all ktor exceptions manually
sirambd Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...n/com/infomaniak/multiplatform_swisstransfer/database/models/appSettings/AppSettingsDB.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class AppSettingsDB() : RealmObject, AppSettings {
companion object {
val DEFAULT_VALIDITY_PERIOD = ValidityPeriod.THIRTY
val DEFAULT_DOWNLOAD_LIMIT = DownloadLimit.TWO_HUNDRED_FIFTY

private val DEFAULT_EMAIL_LANGUAGE = EmailLanguage.ENGLISH
private val DEFAULT_THEME = Theme.SYSTEM
private val DEFAULT_TRANSFER_TYPE = TransferType.QR_CODE
Expand Down
7 changes: 3 additions & 4 deletions ...commonMain/kotlin/com/infomaniak/multiplatform_swisstransfer/network/ApiClientProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ class ApiClientProvider internal constructor(

fun createHttpClient(engine: HttpClientEngineFactory<*>?): HttpClient {
val block: HttpClientConfig<*>.() -> Unit = {
expectSuccess = true
install(UserAgent) {
agent = userAgent
}
Expand Down Expand Up @@ -98,9 +97,9 @@ class ApiClientProvider internal constructor(
is IOException -> throw NetworkException("Network error: ${cause.message}")
is ApiException, is UnexpectedApiErrorFormatException -> throw cause
else -> {
val response = request.call.response
val bodyResponse = response.bodyAsText()
val statusCode = response.status.value
val response = runCatching { request.call.response }.getOrNull()
val bodyResponse = response?.bodyAsText() ?: cause.message ?: ""
val statusCode = response?.status?.value ?: -1
throw UnexpectedApiErrorFormatException(statusCode, bodyResponse, cause)
}
}
Expand Down
Loading