Perform network connectivity checks in the repository

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

@@ -48,40 +48,65 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
     }
 
     suspend fun getNewerItems(): ArrayList<SelfossModel.Item> {
-        // TODO: Check connectivity, use the updatedSince parameter
+        // TODO: Use the updatedSince parameter
-        val fetchedItems = api.getItems(displayedItems.type,
+        if (isConnectionAvailable.value) {
+            val fetchedItems = api.getItems(
+                displayedItems.type,
                 settings.getString("prefer_api_items_number", "200").toInt(),
                 offset = 0,
                 tagFilter?.tag,
                 sourceFilter?.id?.toLong(),
                 searchFilter,
-            null)
+                null
+            )
 
             if (fetchedItems != null) {
                 items = ArrayList(fetchedItems)
             }
+        } else {
+            // TODO: Provide an error message if the connection is not available.
+            // TODO: Get items from the database
+        }
         return items
     }
 
     suspend fun getOlderItems(): ArrayList<SelfossModel.Item> {
-        // TODO: Check connectivity
+        if (isConnectionAvailable.value) {
             val offset = items.size
-        val fetchedItems = api.getItems(displayedItems.type,
+            val fetchedItems = api.getItems(
+                displayedItems.type,
                 settings.getString("prefer_api_items_number", "200").toInt(),
                 offset,
                 tagFilter?.tag,
                 sourceFilter?.id?.toLong(),
                 searchFilter,
-            null)
+                null
+            )
 
             if (fetchedItems != null) {
                 appendItems(fetchedItems)
             }
+        } else {
+            // TODO: Provide an error message
+        }
         return items
     }
 
-    suspend fun allItems(itemType: ItemType): List<SelfossModel.Item>? =
+    suspend fun allItems(itemType: ItemType): List<SelfossModel.Item>? {
-        api.getItems(itemType.type, 200, 0, tagFilter?.tag, sourceFilter?.id?.toLong(), searchFilter, null)
+        return if (isConnectionAvailable.value) {
+            api.getItems(
+                itemType.type,
+                200,
+                0,
+                tagFilter?.tag,
+                sourceFilter?.id?.toLong(),
+                searchFilter,
+                null
+            )
+        } else {
+            null
+        }
+    }
 
     private fun appendItems(fetchedItems: List<SelfossModel.Item>) {
         // TODO: Store in DB if enabled by user
@@ -97,8 +122,8 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
     }
 
     suspend fun reloadBadges(): Boolean {
-        // TODO: Check connectivity, calculate from DB
         var success = false
+        if (isConnectionAvailable.value) {
             val response = api.stats()
             if (response != null) {
                 badgeUnread = response.unread
@@ -106,26 +131,43 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
                 badgeStarred = response.starred
                 success = true
             }
+        } else {
+            // TODO: Compute badges from database
+        }
         return success
     }
 
     suspend fun getTags(): List<SelfossModel.Tag>? {
-        // TODO: Check success, store in DB
+        // TODO: Store in DB
-        return api.tags()
+        return if (isConnectionAvailable.value) {
+            api.tags()
+        } else {
+            // TODO: Compute from database
+            null
+        }
     }
 
     suspend fun getSpouts(): Map<String, SelfossModel.Spout>? {
-        // TODO: Check success, store in DB
+        // TODO: Store in DB
-        return api.spouts()
+        return if (isConnectionAvailable.value) {
+            api.spouts()
+        } else {
+            // TODO: Compute from database
+            null
+        }
     }
 
     suspend fun getSources(): ArrayList<SelfossModel.Source>? {
-        // TODO: Check success
+        // TODO: Store in DB
-        return api.sources()
+        return if (isConnectionAvailable.value) {
+            api.sources()
+        } else {
+            // TODO: Compute from database
+            null
+        }
     }
 
     suspend fun markAsRead(item: SelfossModel.Item): Boolean {
-        // TODO: Check internet connection
         val success = markAsReadById(item.id)
 
         if (success) {
@@ -135,11 +177,15 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
     }
 
     suspend fun markAsReadById(id: Int): Boolean {
-        // TODO: Check internet connection
+        var success = false
-        return api.markAsRead(id.toString())?.isSuccess == true
+        if (isConnectionAvailable.value) {
+            success = api.markAsRead(id.toString())?.isSuccess == true
+        }
+        return success
     }
 
     suspend fun unmarkAsRead(item: SelfossModel.Item): Boolean {
+        // TODO: Check internet connection
         val success = unmarkAsReadById(item.id)
 
         if (success) {
@@ -150,7 +196,11 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
 
     suspend fun unmarkAsReadById(id: Int): Boolean {
         // TODO: Check internet connection
-        return api.unmarkAsRead(id.toString())?.isSuccess == true
+        var success = false
+        if (isConnectionAvailable.value) {
+            success = api.unmarkAsRead(id.toString())?.isSuccess == true
+        }
+        return success
     }
 
     suspend fun starr(item: SelfossModel.Item): Boolean {
@@ -163,8 +213,11 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
     }
 
     suspend fun starrById(id: Int): Boolean {
-        // TODO: Check success, store in DB
+        var success = false
-        return api.starr(id.toString())?.isSuccess == true
+        if (isConnectionAvailable.value) {
+            success = api.starr(id.toString())?.isSuccess == true
+        }
+        return success
     }
 
     suspend fun unstarr(item: SelfossModel.Item): Boolean {
@@ -177,14 +230,19 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
     }
 
     suspend fun unstarrById(id: Int): Boolean {
-        // TODO: Check internet connection
+        var success = false
-        return api.unstarr(id.toString())?.isSuccess == true
+        if (isConnectionAvailable.value) {
+            success = api.unstarr(id.toString())?.isSuccess == true
+        }
+        return success
     }
 
-    suspend fun markAllAsRead(items: ArrayList<SelfossModel.Item>): Boolean {
-        // TODO: Check Internet connectivity, store in DB
 
-        val success = api.markAllAsRead(items.map { it.id.toString() })?.isSuccess == true
+    suspend fun markAllAsRead(items: ArrayList<SelfossModel.Item>): Boolean {
+        var success = false
+        if (isConnectionAvailable) {
+            success = api.markAllAsRead(items.map { it.id.toString() })?.isSuccess == true
+        }
 
         if (success) {
             for (item in items) {
@@ -233,45 +291,51 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
         tags: String,
         filter: String
     ): Boolean {
-        // TODO: Check connectivity
+        var response = false
-        val response = api.createSourceForVersion(
+        if (isConnectionAvailable.value) {
+            response = api.createSourceForVersion(
                 title,
                 url,
                 spout,
                 tags,
                 filter,
                 apiMajorVersion
-        )
+            )?.isSuccess == true
+        }
 
-        return response != null
+        return response
     }
 
     suspend fun deleteSource(id: Int): Boolean {
-        // TODO: Check connectivity, store in DB
+        // TODO: Store in DB
         var success = false
+        if (isConnectionAvailable.value) {
             val response = api.deleteSource(id)
             if (response != null) {
                 success = response.isSuccess
             }
+        }
 
         return success
     }
 
     suspend fun updateRemote(): Boolean {
-        // TODO: Handle connectivity issues
+        var response = false
-        val response = api.update()
+        if (isConnectionAvailable.value) {
-        return response?.isSuccess ?: false
+            response = api.update()?.isSuccess == true
+        }
+        return response
     }
 
     suspend fun login(): Boolean {
         var result = false
+        if (isConnectionAvailable.value) {
             try {
                 val response = api.login()
-            if (response != null && response.isSuccess) {
+                result = response?.isSuccess == true
-                result = true
-            }
             } catch (cause: Throwable) {
-            Napier.e(cause.stackTraceToString(),tag = "RepositoryImpl.updateRemote")
+                Napier.e(cause.stackTraceToString(), tag = "RepositoryImpl.updateRemote")
+            }
         }
         return result
     }
@@ -290,13 +354,14 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
     }
 
     private suspend fun updateApiVersion() {
-        // TODO: Handle connectivity issues
+        apiMajorVersion = settings.getInt("apiVersionMajor", 0)
+
+        if (isConnectionAvailable.value) {
             val fetchedVersion = api.version()
             if (fetchedVersion != null) {
                 apiMajorVersion = fetchedVersion.getApiMajorVersion()
                 settings.putInt("apiVersionMajor", apiMajorVersion)
-        } else {
+            }
-            apiMajorVersion = settings.getInt("apiVersionMajor", 0)
         }
     }