Compare commits

...

3 Commits

Author SHA1 Message Date
4ad4a23ed8 Revert to private functions 2023-09-12 00:38:37 +02:00
d8c215eacc Reintroduce removed parameter 2023-09-12 00:36:56 +02:00
2b446ab22b Revert dependency version changes 2023-09-12 00:36:04 +02:00
2 changed files with 4 additions and 4 deletions

View File

@ -62,8 +62,7 @@ kotlin {
} }
val androidMain by getting { val androidMain by getting {
dependencies { dependencies {
implementation("com.squareup.okhttp3:okhttp:4.10.0") implementation("io.ktor:ktor-client-okhttp:2.1.1")
implementation("io.ktor:ktor-client-okhttp:2.2.4")
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0") implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
// Sql // Sql

View File

@ -51,6 +51,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
prettyPrint = true prettyPrint = true
isLenient = true isLenient = true
ignoreUnknownKeys = true ignoreUnknownKeys = true
explicitNulls = false
}) })
} }
install(Logging) { install(Logging) {
@ -98,8 +99,8 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
} }
// Api version was introduces after the POST login, so when there is a version, it should be available // Api version was introduces after the POST login, so when there is a version, it should be available
fun shouldHavePostLogin() = appSettingsService.getApiVersion() != -1 private fun shouldHavePostLogin() = appSettingsService.getApiVersion() != -1
fun hasLoginInfo() = private fun hasLoginInfo() =
appSettingsService.getUserName().isNotEmpty() && appSettingsService.getPassword() appSettingsService.getUserName().isNotEmpty() && appSettingsService.getPassword()
.isNotEmpty() .isNotEmpty()