Fixing #59.

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/SelfossModel.kt

@@ -105,4 +105,16 @@ class SelfossModel {
             return this
         }
     }
+
+    class StatusAndData<T>(val success: Boolean, val data: T? = null) {
+        companion object {
+            fun <T> succes(d: T): StatusAndData<T> {
+                return StatusAndData(true, d)
+            }
+
+            fun <T> error(): StatusAndData<T> {
+                return StatusAndData(false)
+            }
+        }
+    }
 }

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt

@@ -47,7 +47,7 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
 
     suspend fun getNewerItems(): ArrayList<SelfossModel.Item> {
         // TODO: Use the updatedSince parameter
-        var fetchedItems: List<SelfossModel.Item>? = null
+        var fetchedItems: SelfossModel.StatusAndData<List<SelfossModel.Item>> = SelfossModel.StatusAndData.error()
         if (isNetworkAvailable()) {
             fetchedItems = api.getItems(
                 displayedItems.type,
@@ -59,23 +59,25 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
             )
         } else {
             if (appSettingsService.isItemCachingEnabled()) {
-                fetchedItems = getDBItems().filter {
+                fetchedItems = SelfossModel.StatusAndData.succes(
+                    getDBItems().filter {
                         displayedItems == ItemType.ALL ||
                                 (it.unread && displayedItems == ItemType.UNREAD) ||
                                 (it.starred && displayedItems == ItemType.STARRED)
                     }.map { it.toView() }
+                )
             }
         }
 
-        if (fetchedItems != null) {
+        if (fetchedItems.success && fetchedItems.data != null) {
-            items = ArrayList(fetchedItems)
+            items = ArrayList(fetchedItems.data!!)
             sortItems()
         }
         return items
     }
 
     suspend fun getOlderItems(): ArrayList<SelfossModel.Item> {
-        var fetchedItems: List<SelfossModel.Item>? = null
+        var fetchedItems: SelfossModel.StatusAndData<List<SelfossModel.Item>> = SelfossModel.StatusAndData.error()
         if (isNetworkAvailable()) {
             val offset = items.size
             fetchedItems = api.getItems(
@@ -88,16 +90,16 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
             )
         } // When using the db cache, we load everything the first time, so there should be nothing more to load.
 
-        if (fetchedItems != null) {
+        if (fetchedItems.success && fetchedItems.data != null) {
-            items.addAll(fetchedItems)
+            items.addAll(fetchedItems.data!!)
             sortItems()
         }
         return items
     }
 
-    private suspend fun getMaxItemsForBackground(itemType: ItemType): List<SelfossModel.Item>? {
+    private suspend fun getMaxItemsForBackground(itemType: ItemType): List<SelfossModel.Item> {
         return if (isNetworkAvailable()) {
-            api.getItems(
+            val items = api.getItems(
                 itemType.type,
                 0,
                 tagFilter?.tag,
@@ -106,6 +108,11 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
                 null,
                 200
             )
+            return if (items.success && items.data != null) {
+                items.data
+            } else {
+                emptyList()
+            }
         } else {
             emptyList()
         }
@@ -119,10 +126,10 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
         var success = false
         if (isNetworkAvailable()) {
             val response = api.stats()
-            if (response != null) {
+            if (response.success && response.data != null) {
-                badgeUnread = response.unread
+                badgeUnread = response.data.unread
-                badgeAll = response.total
+                badgeAll = response.data.total
-                badgeStarred = response.starred
+                badgeStarred = response.data.starred
                 success = true
             }
         } else {
@@ -138,10 +145,10 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
     suspend fun getTags(): List<SelfossModel.Tag>? {
         return if (isNetworkAvailable()) {
             val apiTags = api.tags()
-            if (apiTags != null && (appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled())) {
+            if (apiTags.success && apiTags.data != null && (appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled())) {
-                resetDBTagsWithData(apiTags)
+                resetDBTagsWithData(apiTags.data)
             }
-            apiTags
+            apiTags.data
         } else {
             getDBTags().map { it.toView() }
         }
@@ -149,7 +156,12 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
 
     suspend fun getSpouts(): Map<String, SelfossModel.Spout>? {
         return if (isNetworkAvailable()) {
-            api.spouts()
+            val spouts = api.spouts()
+            return if (spouts.success && spouts.data != null) {
+                spouts.data
+            } else {
+                emptyMap() // TODO: do something here
+            }
         } else {
             throw NetworkUnavailableException()
         }
@@ -158,10 +170,10 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
     suspend fun getSources(): ArrayList<SelfossModel.Source>? {
         return if (isNetworkAvailable()) {
             val apiSources = api.sources()
-            if (apiSources != null && (appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled())) {
+            if (apiSources.success && apiSources.data != null && (appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled())) {
-                resetDBSourcesWithData(apiSources)
+                resetDBSourcesWithData(apiSources.data)
             }
-            apiSources
+            apiSources.data
         } else {
             ArrayList(getDBSources().map { it.toView() })
         }
@@ -178,7 +190,7 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
 
     private suspend fun markAsReadById(id: Int): Boolean {
         return if (isNetworkAvailable()) {
-            api.markAsRead(id.toString())?.isSuccess == true
+            api.markAsRead(id.toString())?.isSuccess
         } else {
             insertDBAction(id.toString(), read = true)
             true
@@ -197,7 +209,7 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
 
     private suspend fun unmarkAsReadById(id: Int): Boolean {
         return if (isNetworkAvailable()) {
-            api.unmarkAsRead(id.toString())?.isSuccess == true
+            api.unmarkAsRead(id.toString())?.isSuccess
         } else {
             insertDBAction(id.toString(), unread = true)
             true
@@ -215,7 +227,7 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
 
     private suspend fun starrById(id: Int): Boolean {
         return if (isNetworkAvailable()) {
-            api.starr(id.toString())?.isSuccess == true
+            api.starr(id.toString())?.isSuccess
         } else {
             insertDBAction(id.toString(), starred = true)
             true
@@ -233,7 +245,7 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
 
     private suspend fun unstarrById(id: Int): Boolean {
         return if (isNetworkAvailable()) {
-            api.unstarr(id.toString())?.isSuccess == true
+            api.unstarr(id.toString())?.isSuccess
         } else {
             insertDBAction(id.toString(), starred = true)
             true
@@ -243,7 +255,7 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
     suspend fun markAllAsRead(items: ArrayList<SelfossModel.Item>): Boolean {
         var success = false
 
-        if (isNetworkAvailable() && api.markAllAsRead(items.map { it.id.toString() })?.isSuccess == true) {
+        if (isNetworkAvailable() && api.markAllAsRead(items.map { it.id.toString() })?.isSuccess) {
             success = true
             for (item in items) {
                 markAsReadLocally(item)
@@ -332,7 +344,7 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
 
     suspend fun updateRemote(): Boolean {
         return if (isNetworkAvailable()) {
-            api.update()?.equals("finished") ?: false
+            api.update()?.equals("finished")
         } else {
             false
         }
@@ -365,8 +377,8 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
 
         if (isNetworkAvailable()) {
             val fetchedVersion = api.version()
-            if (fetchedVersion != null && fetchedVersion.getApiMajorVersion() != apiMajorVersion) {
+            if (fetchedVersion.success && fetchedVersion.data != null && fetchedVersion.data.getApiMajorVersion() != apiMajorVersion) {
-                appSettingsService.updateApiVersion(fetchedVersion.getApiMajorVersion())
+                appSettingsService.updateApiVersion(fetchedVersion.data.getApiMajorVersion())
             }
         }
     }
@@ -383,7 +395,7 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
 
     fun getDBSources(): List<SOURCE> = db.sourcesQueries.sources().executeAsList()
 
-    fun resetDBTagsWithData(tagEntities: List<SelfossModel.Tag>) {
+    private fun resetDBTagsWithData(tagEntities: List<SelfossModel.Tag>) {
         db.tagsQueries.deleteAllTags()
 
         db.tagsQueries.transaction {
@@ -393,7 +405,7 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
         }
     }
 
-    fun resetDBSourcesWithData(sources: List<SelfossModel.Source>) {
+    private fun resetDBSourcesWithData(sources: List<SelfossModel.Source>) {
         db.sourcesQueries.deleteAllSources()
 
         db.sourcesQueries.transaction {
@@ -425,7 +437,7 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
             val newItems = getMaxItemsForBackground(ItemType.UNREAD)
             val allItems = getMaxItemsForBackground(ItemType.ALL)
             val starredItems = getMaxItemsForBackground(ItemType.STARRED)
-            insertDBItems(newItems.orEmpty() + allItems.orEmpty() + starredItems.orEmpty())
+            insertDBItems(newItems + allItems + starredItems)
             return newItems
         } catch (e: Throwable) {
             // We do nothing

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt

@@ -10,6 +10,7 @@ import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.client.plugins.logging.*
 import io.ktor.client.request.*
 import io.ktor.client.request.forms.*
+import io.ktor.client.statement.*
 import io.ktor.http.*
 import io.ktor.serialization.kotlinx.json.*
 import kotlinx.serialization.json.Json
@@ -34,7 +35,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                         appSettingsService.logApiCalls(message)
                     }
                 }
-                level = LogLevel.ALL
+                level = LogLevel.INFO
             }
             install(HttpTimeout) {
                 requestTimeoutMillis = appSettingsService.getApiTimeout()
@@ -65,11 +66,11 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         client = createHttpClient()
     }
 
-    suspend fun login(): SelfossModel.SuccessResponse? =
+    suspend fun login(): SelfossModel.SuccessResponse =
-        client.get(url("/login")) {
+        maybeResponse(client.get(url("/login")) {
             parameter("username", appSettingsService.getUserName())
             parameter("password", appSettingsService.getPassword())
-        }.body()
+        })
 
     suspend fun getItems(
         type: String,
@@ -79,8 +80,8 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         search: String?,
         updatedSince: String?,
         items: Int? = null
-    ): List<SelfossModel.Item>? =
+    ): SelfossModel.StatusAndData<List<SelfossModel.Item>> =
-        client.get(url("/items")) {
+        bodyOrFailure(client.get(url("/items")) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
                 parameter("type", type)
@@ -90,74 +91,74 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                 parameter("updatedsince", updatedSince)
                 parameter("items", items ?: appSettingsService.getItemsNumber())
                 parameter("offset", offset)
-            }.body()
+            })
 
-    suspend fun stats(): SelfossModel.Stats? =
+    suspend fun stats(): SelfossModel.StatusAndData<SelfossModel.Stats> =
-        client.get(url("/stats")) {
+        bodyOrFailure(client.get(url("/stats")) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
-            }.body()
+            })
 
-    suspend fun tags(): List<SelfossModel.Tag>? =
+    suspend fun tags(): SelfossModel.StatusAndData<List<SelfossModel.Tag>> =
-        client.get(url("/tags")) {
+        bodyOrFailure(client.get(url("/tags")) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
-            }.body()
+            })
 
-    suspend fun update(): String? =
+    suspend fun update(): SelfossModel.StatusAndData<String> =
-        client.get(url("/update")) {
+        bodyOrFailure(client.get(url("/update")) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
-            }.body()
+            })
 
-    suspend fun spouts(): Map<String, SelfossModel.Spout>? =
+    suspend fun spouts(): SelfossModel.StatusAndData<Map<String, SelfossModel.Spout>> =
-        client.get(url("/sources/spouts")) {
+        bodyOrFailure(client.get(url("/sources/spouts")) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
-            }.body()
+            })
 
-    suspend fun sources(): ArrayList<SelfossModel.Source>? =
+    suspend fun sources(): SelfossModel.StatusAndData<ArrayList<SelfossModel.Source>> =
-        client.get(url("/sources/list")) {
+        bodyOrFailure(client.get(url("/sources/list")) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
-            }.body()
+            })
 
-    suspend fun version(): SelfossModel.ApiVersion? =
+    suspend fun version(): SelfossModel.StatusAndData<SelfossModel.ApiVersion> =
-        client.get(url("/api/about")).body()
+        bodyOrFailure(client.get(url("/api/about")))
 
-    suspend fun markAsRead(id: String): SelfossModel.SuccessResponse? =
+    suspend fun markAsRead(id: String): SelfossModel.SuccessResponse =
-        client.post(url("/mark/$id")) {
+        maybeResponse(client.post(url("/mark/$id")) {
             parameter("username", appSettingsService.getUserName())
             parameter("password", appSettingsService.getPassword())
-        }.body()
+        })
 
-    suspend fun unmarkAsRead(id: String): SelfossModel.SuccessResponse? =
+    suspend fun unmarkAsRead(id: String): SelfossModel.SuccessResponse =
-        client.post(url("/unmark/$id")) {
+        maybeResponse(client.post(url("/unmark/$id")) {
             parameter("username", appSettingsService.getUserName())
             parameter("password", appSettingsService.getPassword())
-        }.body()
+        })
 
-    suspend fun starr(id: String): SelfossModel.SuccessResponse? =
+    suspend fun starr(id: String): SelfossModel.SuccessResponse =
-        client.post(url("/starr/$id")) {
+        maybeResponse(client.post(url("/starr/$id")) {
             parameter("username", appSettingsService.getUserName())
             parameter("password", appSettingsService.getPassword())
-        }.body()
+        })
 
-    suspend fun unstarr(id: String): SelfossModel.SuccessResponse? =
+    suspend fun unstarr(id: String): SelfossModel.SuccessResponse =
-        client.post(url("/unstarr/$id")) {
+        maybeResponse(client.post(url("/unstarr/$id")) {
             parameter("username", appSettingsService.getUserName())
             parameter("password", appSettingsService.getPassword())
-        }.body()
+        })
 
-    suspend fun markAllAsRead(ids: List<String>): SelfossModel.SuccessResponse? =
+    suspend fun markAllAsRead(ids: List<String>): SelfossModel.SuccessResponse =
-        client.submitForm(
+        maybeResponse(client.submitForm(
             url = url("/mark"),
             formParameters = Parameters.build {
                 append("username", appSettingsService.getUserName())
                 append("password", appSettingsService.getPassword())
                 ids.map { append("ids[]", it) }
             }
-        ).body()
+        ))
 
     suspend fun createSourceForVersion(
         title: String,
@@ -166,12 +167,14 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         tags: String,
         filter: String,
         version: Int
-    ): SelfossModel.SuccessResponse? =
+    ): SelfossModel.SuccessResponse =
+        maybeResponse(
             if (version > 1) {
                 createSource2(title, url, spout, tags, filter)
             } else {
                 createSource(title, url, spout, tags, filter)
             }
+        )
 
     suspend fun createSource(
         title: String,
@@ -179,7 +182,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         spout: String,
         tags: String,
         filter: String
-    ): SelfossModel.SuccessResponse? =
+    ): HttpResponse =
         client.submitForm(
             url = url("/source?username=${appSettingsService.getUserName()}&password=${appSettingsService.getPassword()}"),
             formParameters = Parameters.build {
@@ -189,7 +192,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                 append("tags", tags)
                 append("filter", filter)
             }
-        ).body()
+        )
 
     suspend fun createSource2(
         title: String,
@@ -197,7 +200,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
         spout: String,
         tags: String,
         filter: String
-    ): SelfossModel.SuccessResponse? =
+    ): HttpResponse =
         client.submitForm(
             url = url("/source?username=${appSettingsService.getUserName()}&password=${appSettingsService.getPassword()}"),
             formParameters = Parameters.build {
@@ -207,11 +210,27 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
                 append("tags[]", tags)
                 append("filter", filter)
             }
-        ).body()
+        )
 
-    suspend fun deleteSource(id: Int): SelfossModel.SuccessResponse? =
+    suspend fun deleteSource(id: Int): SelfossModel.SuccessResponse =
-        client.delete(url("/source/$id")) {
+        maybeResponse(client.delete(url("/source/$id")) {
                 parameter("username", appSettingsService.getUserName())
                 parameter("password", appSettingsService.getPassword())
-            }.body()
+            })
+
+    suspend fun maybeResponse(r: HttpResponse): SelfossModel.SuccessResponse {
+        return if (r.status.isSuccess()) {
+            r.body()
+        } else {
+            SelfossModel.SuccessResponse(false)
+        }
+    }
+
+    suspend inline fun <reified T> bodyOrFailure(r: HttpResponse): SelfossModel.StatusAndData<T> {
+        return if (r.status.isSuccess()) {
+            SelfossModel.StatusAndData.succes(r.body())
+        } else {
+            SelfossModel.StatusAndData.error()
+        }
+    }
 }