From 44a0469b176df3dfddf93091914aef163085e6c3 Mon Sep 17 00:00:00 2001 From: aminecmi Date: Fri, 19 Aug 2022 22:38:55 +0200 Subject: [PATCH] Fixes #25; --- .../apps/readerforselfossv2/repository/RepositoryImpl.kt | 9 +++++++-- .../bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt index e4e7d90..2344d20 100644 --- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt +++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt @@ -329,8 +329,13 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails return success } - suspend fun updateRemote(): Boolean = - isNetworkAvailable() && api.update()?.isSuccess == true + suspend fun updateRemote(): Boolean { + return if (isNetworkAvailable()) { + api.update()?.equals("finished") ?: false + } else { + false + } + } suspend fun login(): Boolean { var result = false diff --git a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt index 0047453..084d987 100644 --- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt +++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt @@ -100,7 +100,7 @@ class SelfossApi(private val apiDetailsService: ApiDetailsService) { parameter("password", apiDetailsService.getPassword()) }.body() - suspend fun update(): SelfossModel.SuccessResponse? = + suspend fun update(): String? = client.get(url("/update")) { parameter("username", apiDetailsService.getUserName()) parameter("password", apiDetailsService.getPassword())