Revert to private functions

Reintroduce removed parameter
Revert dependency version changes
2023-09-12 00:38:37 +02:00 · 2023-09-12 00:36:56 +02:00 · 2023-09-12 00:36:04 +02:00
2 changed files with 4 additions and 4 deletions
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@ -62,8 +62,7 @@ kotlin {
        }
        val androidMain by getting {
            dependencies {
-                implementation("com.squareup.okhttp3:okhttp:4.10.0")
-                implementation("io.ktor:ktor-client-okhttp:2.2.4")
+                implementation("io.ktor:ktor-client-okhttp:2.1.1")
                implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")

                // Sql
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt
@ -51,6 +51,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                    prettyPrint = true
                    isLenient = true
                    ignoreUnknownKeys = true
+                    explicitNulls = false
                })
            }
            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
-    fun shouldHavePostLogin() = appSettingsService.getApiVersion() != -1
-    fun hasLoginInfo() =
+    private fun shouldHavePostLogin() = appSettingsService.getApiVersion() != -1
+    private fun hasLoginInfo() =
        appSettingsService.getUserName().isNotEmpty() && appSettingsService.getPassword()
            .isNotEmpty()
Author	SHA1	Message	Date
davidoskky	4ad4a23ed8	Revert to private functions	2023-09-12 00:38:37 +02:00
davidoskky	d8c215eacc	Reintroduce removed parameter	2023-09-12 00:36:56 +02:00
davidoskky	2b446ab22b	Revert dependency version changes	2023-09-12 00:36:04 +02:00