androidApp/build.gradle.kts

@@ -12,38 +12,28 @@ plugins {
     id("app.cash.sqldelight") version "2.0.2"
 }
 
-fun Project.execWithOutput(
-    cmd: String,
-    ignore: Boolean = false,
-): String {
-    val result: String =
-        ByteArrayOutputStream().use { outputStream ->
-            project.exec {
-                commandLine = cmd.split(" ")
-                standardOutput = outputStream
-                isIgnoreExitValue = ignore
-            }
-            outputStream.toString()
+fun Project.execWithOutput(cmd: String, ignore: Boolean = false): String {
+    val result: String = ByteArrayOutputStream().use { outputStream ->
+        project.exec {
+            commandLine = cmd.split(" ")
+            standardOutput = outputStream
+            isIgnoreExitValue = ignore
         }
+        outputStream.toString()
+    }
     return result
 }
 
 fun gitVersion(): String {
     val maybeTagOfCurrentCommit = execWithOutput("git -C ../ describe --contains HEAD", true)
-    val process =
-        if (maybeTagOfCurrentCommit.isEmpty()) {
-            println("No tag on current commit. Will take the latest one.")
-            execWithOutput("git -C ../ for-each-ref refs/tags --sort=-refname --format='%(refname:short)' --count=1")
-        } else {
-            println("Tag found on current commit")
-            execWithOutput("git -C ../ describe --contains HEAD")
-        }
-    return process
-        .replace("^0", "")
-        .replace("'", "")
-        .substring(1)
-        .replace("\\.", "")
-        .trim()
+    val process = if (maybeTagOfCurrentCommit.isEmpty()) {
+        println("No tag on current commit. Will take the latest one.")
+        execWithOutput("git -C ../ for-each-ref refs/tags --sort=-refname --format='%(refname:short)' --count=1")
+    } else {
+        println("Tag found on current commit")
+        execWithOutput("git -C ../ describe --contains HEAD")
+    }
+    return process.replace("^0", "").replace("'", "").substring(1).replace("\\.", "").trim()
 }
 
 fun versionCodeFromGit(): Int {
@@ -126,6 +116,7 @@ android {
             isIncludeAndroidResources = true
         }
     }
+
 }
 
 dependencies {
@@ -150,7 +141,7 @@ dependencies {
     implementation("androidx.constraintlayout:constraintlayout:2.2.0")
     implementation("org.jsoup:jsoup:1.18.3")
 
-    // multidex
+    //multidex
     implementation("androidx.multidex:multidex:2.0.1")
 
     // About
@@ -171,28 +162,31 @@ dependencies {
     implementation("me.relex:circleindicator:2.1.6")
     implementation("androidx.viewpager2:viewpager2:1.1.0")
 
-    // Dependency Injection
+    //Dependency Injection
     implementation("org.kodein.di:kodein-di:7.23.1")
     implementation("org.kodein.di:kodein-di-framework-android-x:7.23.1")
     implementation("org.kodein.di:kodein-di-framework-android-x-viewmodel:7.23.1")
 
-    // Settings
+    //Settings
     implementation("com.russhwolf:multiplatform-settings-no-arg:1.3.0")
 
-    // Logging
+    //Logging
     implementation("io.github.aakira:napier:2.7.1")
 
-    // PhotoView
+    //PhotoView
     implementation("com.github.chrisbanes:PhotoView:2.3.0")
 
     implementation("androidx.core:core-ktx:1.15.0")
 
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
 
+    // Network information
+    implementation("com.github.ln-12:multiplatform-connectivity-status:1.3.0")
+
     // SQLDELIGHT
     implementation("app.cash.sqldelight:android-driver:2.0.2")
 
-    // test
+    //test
     testImplementation("junit:junit:4.13.2")
     testImplementation("io.mockk:mockk:1.13.14")
     testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
@@ -216,12 +210,11 @@ tasks.withType<Test> {
     useJUnit()
     testLogging {
         exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
-        events =
-            setOf(
-                org.gradle.api.tasks.testing.logging.TestLogEvent.PASSED,
-                org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED,
-                org.gradle.api.tasks.testing.logging.TestLogEvent.STANDARD_ERROR,
-            )
+        events = setOf(
+            org.gradle.api.tasks.testing.logging.TestLogEvent.PASSED,
+            org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED,
+            org.gradle.api.tasks.testing.logging.TestLogEvent.STANDARD_ERROR
+        )
         showStandardStreams = true
     }
 }
@@ -234,4 +227,4 @@ aboutLibraries {
     strictMode = com.mikepenz.aboutlibraries.plugin.StrictMode.FAIL
     duplicationMode = com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE
     duplicationRule = com.mikepenz.aboutlibraries.plugin.DuplicateRule.GROUP
-}
+}

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/MyApp.kt

@@ -10,16 +10,18 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.multidex.MultiDexApplication
 import bou.amine.apps.readerforselfossv2.android.testing.TestingHelper
+import bou.amine.apps.readerforselfossv2.android.viewmodel.AppViewModel
 import bou.amine.apps.readerforselfossv2.dao.DriverFactory
 import bou.amine.apps.readerforselfossv2.dao.ReaderForSelfossDB
 import bou.amine.apps.readerforselfossv2.di.networkModule
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
-import bou.amine.apps.readerforselfossv2.service.ConnectivityService
+import com.github.ln_12.library.ConnectivityStatus
 import io.github.aakira.napier.DebugAntilog
 import io.github.aakira.napier.Napier
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 import org.acra.ACRA
 import org.acra.ReportField
@@ -42,21 +44,27 @@ class MyApp :
         import(networkModule)
         bind<DriverFactory>() with singleton { DriverFactory(applicationContext) }
         bind<ReaderForSelfossDB>() with singleton { ReaderForSelfossDB(driverFactory.createDriver()) }
-        bind<ConnectivityService>() with singleton { ConnectivityService() }
         bind<Repository>() with
             singleton {
                 Repository(
                     instance(),
                     instance(),
-                    instance(),
+                    isConnectionAvailable,
                     instance(),
                 )
             }
+        bind<ConnectivityStatus>() with singleton { ConnectivityStatus(applicationContext) }
+        bind<AppViewModel>() with singleton { AppViewModel(repository = instance()) }
     }
 
     private val repository: Repository by instance()
+    private val viewModel: AppViewModel by instance()
+    private val connectivityStatus: ConnectivityStatus by instance()
     private val driverFactory: DriverFactory by instance()
-    private val connectivityService: ConnectivityService by instance()
+
+    @Suppress("detekt:ForbiddenComment")
+    // TODO: handle with the "previous" way
+    private val isConnectionAvailable: MutableStateFlow<Boolean> = MutableStateFlow(true)
 
     override fun onCreate() {
         super.onCreate()
@@ -69,12 +77,13 @@ class MyApp :
 
             ProcessLifecycleOwner.get().lifecycle.addObserver(
                 AppLifeCycleObserver(
-                    connectivityService,
+                    connectivityStatus,
+                    repository,
                 ),
             )
 
             CoroutineScope(Dispatchers.Main).launch {
-                connectivityService.networkAvailableProvider.collect { networkAvailable ->
+                viewModel.networkAvailableProvider.collect { networkAvailable ->
                     val toastMessage =
                         if (networkAvailable) {
                             repository.handleDBActions()
@@ -180,15 +189,18 @@ class MyApp :
     }
 
     class AppLifeCycleObserver(
-        val connectivityService: ConnectivityService,
+        val connectivityStatus: ConnectivityStatus,
+        val repository: Repository,
     ) : DefaultLifecycleObserver {
         override fun onResume(owner: LifecycleOwner) {
             super.onResume(owner)
-            connectivityService.start()
+            repository.connectionMonitored = true
+            connectivityStatus.start()
         }
 
         override fun onPause(owner: LifecycleOwner) {
-            connectivityService.stop()
+            repository.connectionMonitored = false
+            connectivityStatus.stop()
             super.onPause(owner)
         }
     }

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ArticleFragment.kt

@@ -42,7 +42,6 @@ import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.rest.MercuryApi
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
-import bou.amine.apps.readerforselfossv2.service.ConnectivityService
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.getImages
 import bou.amine.apps.readerforselfossv2.utils.getThumbnail
@@ -89,7 +88,6 @@ class ArticleFragment :
     override val di: DI by closestDI()
     private val repository: Repository by instance()
     private val appSettingsService: AppSettingsService by instance()
-    private val connectivityService: ConnectivityService by instance()
 
     private var typeface: Typeface? = null
     private var resId: Int = 0
@@ -170,7 +168,7 @@ class ArticleFragment :
 
     private fun handleContent() {
         if (contentText.isEmptyOrNullOrNullString()) {
-            if (connectivityService.isNetworkAvailable() == true && url.isUrlValid()) {
+            if (repository.isNetworkAvailable() && url.isUrlValid()) {
                 getContentFromMercury(url!!)
             }
         } else {

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/viewmodel/AppViewModel.kt

@@ -0,0 +1,32 @@
+package bou.amine.apps.readerforselfossv2.android.viewmodel
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import bou.amine.apps.readerforselfossv2.repository.Repository
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.launch
+
+class AppViewModel(
+    private val repository: Repository,
+) : ViewModel() {
+    private val _networkAvailableProvider = MutableSharedFlow<Boolean>()
+    val networkAvailableProvider = _networkAvailableProvider.asSharedFlow()
+    private var wasConnected = true
+
+    init {
+        viewModelScope.launch {
+            repository.isConnectionAvailable.collect { isConnected ->
+                if (repository.connectionMonitored) {
+                    if (isConnected && !wasConnected && repository.connectionMonitored) {
+                        _networkAvailableProvider.emit(true)
+                        wasConnected = true
+                    } else if (!isConnected && wasConnected && repository.connectionMonitored) {
+                        _networkAvailableProvider.emit(false)
+                        wasConnected = false
+                    }
+                }
+            }
+        }
+    }
+}

androidApp/src/test/kotlin/bou/amine/apps/readerforselfossv2/tests/repository/RepositoryTest.kt

@@ -11,7 +11,6 @@ import bou.amine.apps.readerforselfossv2.model.SuccessResponse
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.rest.SelfossApi
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
-import bou.amine.apps.readerforselfossv2.service.ConnectivityService
 import bou.amine.apps.readerforselfossv2.utils.ItemType
 import bou.amine.apps.readerforselfossv2.utils.toView
 import io.mockk.clearAllMocks
@@ -25,6 +24,7 @@ import junit.framework.TestCase.assertFalse
 import junit.framework.TestCase.assertNotSame
 import junit.framework.TestCase.assertSame
 import junit.framework.TestCase.assertTrue
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertNotEquals
 import org.junit.Before
@@ -52,12 +52,15 @@ class RepositoryTest {
     private val db = mockk<ReaderForSelfossDB>(relaxed = true)
     private val appSettingsService = mockk<AppSettingsService>()
     private val api = mockk<SelfossApi>()
-    private val connectivityService = mockk<ConnectivityService>()
     private lateinit var repository: Repository
 
-    private fun initializeRepository(isNetworkAvailable: Boolean? = true) {
-        every { connectivityService.isNetworkAvailable() } returns isNetworkAvailable
-        repository = Repository(api, appSettingsService, connectivityService, db)
+    private fun initializeRepository(
+        isConnectionAvailable: MutableStateFlow<Boolean> =
+            MutableStateFlow(
+                true,
+            ),
+    ) {
+        repository = Repository(api, appSettingsService, isConnectionAvailable, db)
 
         runBlocking {
             repository.updateApiInformation()
@@ -107,7 +110,7 @@ class RepositoryTest {
     fun instantiate_repository_without_api_version() {
         every { appSettingsService.getApiVersion() } returns -1
 
-        initializeRepository(false)
+        initializeRepository(MutableStateFlow(false))
 
         coVerify(exactly = 0) { api.apiInformation() }
         coVerify(exactly = 0) { api.stats() }
@@ -284,7 +287,7 @@ class RepositoryTest {
     fun get_newer_items_without_connectivity() {
         every { appSettingsService.isItemCachingEnabled() } returns true
 
-        initializeRepository(false)
+        initializeRepository(MutableStateFlow(false))
         runBlocking {
             repository.getNewerItems()
         }
@@ -311,7 +314,7 @@ class RepositoryTest {
 
         every { appSettingsService.isItemCachingEnabled() } returns true
 
-        initializeRepository(false)
+        initializeRepository(MutableStateFlow(false))
         repository.setTagFilter(SelfossModel.Tag("Test", "red", 3))
         runBlocking {
             repository.getNewerItems()
@@ -339,7 +342,7 @@ class RepositoryTest {
 
         every { appSettingsService.isItemCachingEnabled() } returns true
 
-        initializeRepository(false)
+        initializeRepository(MutableStateFlow(false))
         repository.setSourceFilter(
             SelfossModel.SourceDetail(
                 1,
@@ -454,7 +457,7 @@ class RepositoryTest {
 
         var success: Boolean
 
-        initializeRepository(false)
+        initializeRepository(MutableStateFlow(false))
         runBlocking {
             success = repository.reloadBadges()
         }
@@ -474,7 +477,7 @@ class RepositoryTest {
 
         var success: Boolean
 
-        initializeRepository(false)
+        initializeRepository(MutableStateFlow(false))
         runBlocking {
             success = repository.reloadBadges()
         }
@@ -569,7 +572,7 @@ class RepositoryTest {
         every { appSettingsService.isUpdateSourcesEnabled() } returns true
         every { appSettingsService.isItemCachingEnabled() } returns true
 
-        initializeRepository(false)
+        initializeRepository(MutableStateFlow(false))
         var testTags: List<SelfossModel.Tag>
         runBlocking {
             testTags = repository.getTags()
@@ -587,7 +590,7 @@ class RepositoryTest {
         every { appSettingsService.isItemCachingEnabled() } returns false
         every { appSettingsService.isUpdateSourcesEnabled() } returns true
 
-        initializeRepository(false)
+        initializeRepository(MutableStateFlow(false))
         var testTags: List<SelfossModel.Tag>
         runBlocking {
             testTags = repository.getTags()
@@ -604,7 +607,7 @@ class RepositoryTest {
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
         every { appSettingsService.isItemCachingEnabled() } returns true
 
-        initializeRepository(false)
+        initializeRepository(MutableStateFlow(false))
         var testTags: List<SelfossModel.Tag>
         runBlocking {
             testTags = repository.getTags()
@@ -622,7 +625,7 @@ class RepositoryTest {
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
         every { appSettingsService.isItemCachingEnabled() } returns false
 
-        initializeRepository(false)
+        initializeRepository(MutableStateFlow(false))
         var testTags: List<SelfossModel.Tag>
         runBlocking {
             testTags = repository.getTags()
@@ -772,7 +775,7 @@ class RepositoryTest {
     @Test
     fun get_sources_without_connection() {
         val (_, sourcesDB) = prepareSources()
-        initializeRepository(false)
+        initializeRepository(MutableStateFlow(false))
         var testSources: List<SelfossModel.Source>
         runBlocking {
             testSources = repository.getSourcesDetails()
@@ -789,7 +792,7 @@ class RepositoryTest {
 
         every { appSettingsService.isItemCachingEnabled() } returns false
         every { appSettingsService.isUpdateSourcesEnabled() } returns true
-        initializeRepository(false)
+        initializeRepository(MutableStateFlow(false))
         var testSources: List<SelfossModel.Source>
         runBlocking {
             testSources = repository.getSourcesDetails()
@@ -806,7 +809,7 @@ class RepositoryTest {
 
         every { appSettingsService.isItemCachingEnabled() } returns true
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
-        initializeRepository(false)
+        initializeRepository(MutableStateFlow(false))
         var testSources: List<SelfossModel.Source>
         runBlocking {
             testSources = repository.getSourcesDetails()
@@ -823,7 +826,7 @@ class RepositoryTest {
 
         every { appSettingsService.isItemCachingEnabled() } returns false
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
-        initializeRepository(false)
+        initializeRepository(MutableStateFlow(false))
         var testSources: List<SelfossModel.Source>
         runBlocking {
             testSources = repository.getSourcesDetails()
@@ -895,7 +898,7 @@ class RepositoryTest {
         coEvery { api.createSourceForVersion(any(), any(), any(), any()) } returns
             SuccessResponse(true)
 
-        initializeRepository(false)
+        initializeRepository(MutableStateFlow(false))
         var response: Boolean
         runBlocking {
             response =
@@ -952,7 +955,7 @@ class RepositoryTest {
     fun delete_source_without_connection() {
         coEvery { api.deleteSource(any()) } returns SuccessResponse(false)
 
-        initializeRepository(false)
+        initializeRepository(MutableStateFlow(false))
         var response: Boolean
         runBlocking {
             response = repository.deleteSource(5, "src")
@@ -1025,7 +1028,7 @@ class RepositoryTest {
                 data = "undocumented...",
             )
 
-        initializeRepository(false)
+        initializeRepository(MutableStateFlow(false))
         var response: Boolean
         runBlocking {
             response = repository.updateRemote()
@@ -1067,7 +1070,7 @@ class RepositoryTest {
     fun login_but_without_connection() {
         coEvery { api.login() } returns SuccessResponse(success = true)
 
-        initializeRepository(false)
+        initializeRepository(MutableStateFlow(false))
         var response: Boolean
         runBlocking {
             response = repository.login()
@@ -1147,7 +1150,7 @@ class RepositoryTest {
         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
             StatusAndData(success = false, data = generateTestApiItem())
 
-        initializeRepository(false)
+        initializeRepository(MutableStateFlow(false))
         prepareSearch()
         runBlocking {
             repository.tryToCacheItemsAndGetNewOnes()

shared/build.gradle.kts

@@ -4,6 +4,7 @@ object SqlDelight {
     const val runtime = "app.cash.sqldelight:runtime:2.0.2"
     const val android = "app.cash.sqldelight:android-driver:2.0.2"
     const val native = "app.cash.sqldelight:native-driver:2.0.2"
+
 }
 
 plugins {
@@ -40,13 +41,13 @@ kotlin {
 
                 implementation("org.jsoup:jsoup:1.15.4")
 
-                // Dependency Injection
+                //Dependency Injection
                 implementation("org.kodein.di:kodein-di:7.14.0")
 
-                // Settings
+                //Settings
                 implementation("com.russhwolf:multiplatform-settings-no-arg:1.0.0-RC")
 
-                // Logging
+                //Logging
                 implementation("io.github.aakira:napier:2.6.1")
 
                 // Sql
@@ -54,10 +55,6 @@ kotlin {
 
                 // Sql
                 implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
-
-                // Connectivity
-                implementation("dev.jordond.connectivity:connectivity-core:1.2.0")
-                implementation("dev.jordond.connectivity:connectivity-device:1.2.0")
             }
         }
         val commonTest by getting {
@@ -117,4 +114,4 @@ sqldelight {
             packageName.set("bou.amine.apps.readerforselfossv2.dao")
         }
     }
-}
+}

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

@@ -13,7 +13,6 @@ import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.model.StatusAndData
 import bou.amine.apps.readerforselfossv2.rest.SelfossApi
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
-import bou.amine.apps.readerforselfossv2.service.ConnectivityService
 import bou.amine.apps.readerforselfossv2.utils.ItemType
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.toEntity
@@ -31,10 +30,11 @@ private const val MAX_ITEMS_NUMBER = 200
 class Repository(
     private val api: SelfossApi,
     private val appSettingsService: AppSettingsService,
-    private val connectivityService: ConnectivityService,
+    val isConnectionAvailable: MutableStateFlow<Boolean>,
     private val db: ReaderForSelfossDB,
 ) {
     var items = ArrayList<SelfossModel.Item>()
+    var connectionMonitored = false
 
     var baseUrl = appSettingsService.getBaseUrl()
 
@@ -63,7 +63,7 @@ class Repository(
 
     suspend fun getNewerItems(): ArrayList<SelfossModel.Item> {
         var fetchedItems: StatusAndData<List<SelfossModel.Item>> = StatusAndData.error()
-        if (connectivityService.isNetworkAvailable() == true) {
+        if (isNetworkAvailable()) {
             fetchedItems =
                 api.getItems(
                     displayedItems.type,
@@ -102,7 +102,7 @@ class Repository(
 
     suspend fun getOlderItems(): ArrayList<SelfossModel.Item> {
         var fetchedItems: StatusAndData<List<SelfossModel.Item>> = StatusAndData.error()
-        if (connectivityService.isNetworkAvailable() == true) {
+        if (isNetworkAvailable()) {
             val offset = items.size
             fetchedItems =
                 api.getItems(
@@ -122,7 +122,7 @@ class Repository(
     }
 
     private suspend fun getMaxItemsForBackground(itemType: ItemType): List<SelfossModel.Item> {
-        return if (connectivityService.isNetworkAvailable() == true) {
+        return if (isNetworkAvailable()) {
             val items =
                 api.getItems(
                     itemType.type,
@@ -146,7 +146,7 @@ class Repository(
     @Suppress("detekt:ForbiddenComment")
     suspend fun reloadBadges(): Boolean {
         var success = false
-        if (connectivityService.isNetworkAvailable() == true) {
+        if (isNetworkAvailable()) {
             val response = api.stats()
             if (response.success && response.data != null) {
                 _badgeUnread.value = response.data.unread ?: 0
@@ -168,7 +168,7 @@ class Repository(
     suspend fun getTags(): List<SelfossModel.Tag> {
         val isDatabaseEnabled =
             appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
-        return if (connectivityService.isNetworkAvailable() == true && !fetchedTags) {
+        return if (isNetworkAvailable() && !fetchedTags) {
             val apiTags = api.tags()
             if (apiTags.success && apiTags.data != null && isDatabaseEnabled) {
                 resetDBTagsWithData(apiTags.data)
@@ -185,7 +185,7 @@ class Repository(
     }
 
     suspend fun getSpouts(): Map<String, SelfossModel.Spout> =
-        if (connectivityService.isNetworkAvailable() == true) {
+        if (isNetworkAvailable()) {
             val spouts = api.spouts()
             if (spouts.success && spouts.data != null) {
                 spouts.data
@@ -201,7 +201,7 @@ class Repository(
         val isDatabaseEnabled =
             appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
         val shouldFetch = if (!appSettingsService.isUpdateSourcesEnabled()) !fetchedSources else true
-        if (shouldFetch && connectivityService.isNetworkAvailable() == true) {
+        if (shouldFetch && isNetworkAvailable()) {
             if (appSettingsService.getPublicAccess()) {
                 val apiSources = api.sourcesStats()
                 if (apiSources.success && apiSources.data != null) {
@@ -223,7 +223,7 @@ class Repository(
         val isDatabaseEnabled =
             appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled()
         val shouldFetch = if (!appSettingsService.isUpdateSourcesEnabled()) !fetchedSources else true
-        if (shouldFetch && connectivityService.isNetworkAvailable() == true) {
+        if (shouldFetch && isNetworkAvailable()) {
             val apiSources = api.sourcesDetailed()
             if (apiSources.success && apiSources.data != null) {
                 fetchedSources = true
@@ -248,7 +248,7 @@ class Repository(
     }
 
     private suspend fun markAsReadById(id: Int): Boolean =
-        if (connectivityService.isNetworkAvailable() == true) {
+        if (isNetworkAvailable()) {
             api.markAsRead(id.toString()).isSuccess
         } else {
             insertDBAction(id.toString(), read = true)
@@ -265,7 +265,7 @@ class Repository(
     }
 
     private suspend fun unmarkAsReadById(id: Int): Boolean =
-        if (connectivityService.isNetworkAvailable() == true) {
+        if (isNetworkAvailable()) {
             api.unmarkAsRead(id.toString()).isSuccess
         } else {
             insertDBAction(id.toString(), unread = true)
@@ -282,7 +282,7 @@ class Repository(
     }
 
     private suspend fun starrById(id: Int): Boolean =
-        if (connectivityService.isNetworkAvailable() == true) {
+        if (isNetworkAvailable()) {
             api.starr(id.toString()).isSuccess
         } else {
             insertDBAction(id.toString(), starred = true)
@@ -299,7 +299,7 @@ class Repository(
     }
 
     private suspend fun unstarrById(id: Int): Boolean =
-        if (connectivityService.isNetworkAvailable() == true) {
+        if (isNetworkAvailable()) {
             api.unstarr(id.toString()).isSuccess
         } else {
             insertDBAction(id.toString(), starred = true)
@@ -309,10 +309,7 @@ class Repository(
     suspend fun markAllAsRead(items: ArrayList<SelfossModel.Item>): Boolean {
         var success = false
 
-        if (connectivityService.isNetworkAvailable() != null &&
-            connectivityService.isNetworkAvailable()!! &&
-            api.markAllAsRead(items.map { it.id.toString() }).isSuccess
-        ) {
+        if (isNetworkAvailable() && api.markAllAsRead(items.map { it.id.toString() }).isSuccess) {
             success = true
             for (item in items) {
                 markAsReadLocally(item)
@@ -372,7 +369,7 @@ class Repository(
         tags: String,
     ): Boolean {
         var response = false
-        if (connectivityService.isNetworkAvailable() == true) {
+        if (isNetworkAvailable()) {
             response = api
                 .createSourceForVersion(
                     title,
@@ -393,7 +390,7 @@ class Repository(
         tags: String,
     ): Boolean {
         var response = false
-        if (connectivityService.isNetworkAvailable() == true) {
+        if (isNetworkAvailable()) {
             response = api.updateSourceForVersion(id, title, url, spout, tags).isSuccess == true
         }
 
@@ -405,13 +402,13 @@ class Repository(
         title: String,
     ): Boolean {
         var success = false
-        if (connectivityService.isNetworkAvailable() == true) {
+        if (isNetworkAvailable()) {
             val response = api.deleteSource(id)
             success = response.isSuccess
         }
 
         // We filter on success or if the network isn't available
-        if (success || !(connectivityService.isNetworkAvailable() == true)) {
+        if (success || !isNetworkAvailable()) {
             items = ArrayList(items.filter { it.sourcetitle != title })
             setReaderItems(items)
             db.itemsQueries.deleteItemsWhereSource(title)
@@ -421,7 +418,7 @@ class Repository(
     }
 
     suspend fun updateRemote(): Boolean =
-        if (connectivityService.isNetworkAvailable() == true) {
+        if (isNetworkAvailable()) {
             api.update().data.equals("finished")
         } else {
             false
@@ -429,7 +426,7 @@ class Repository(
 
     suspend fun login(): Boolean {
         var result = false
-        if (connectivityService.isNetworkAvailable() == true) {
+        if (isNetworkAvailable()) {
             try {
                 val response = api.login()
                 result = response.isSuccess == true
@@ -442,7 +439,7 @@ class Repository(
 
     suspend fun checkIfFetchFails(): Boolean {
         var fetchFailed = true
-        if (connectivityService.isNetworkAvailable() == true) {
+        if (isNetworkAvailable()) {
             try {
                 // Trying to fetch one item, and check someone is trying to use the app with
                 // a random rss feed, that would throw a NoTransformationFoundException
@@ -456,7 +453,7 @@ class Repository(
     }
 
     suspend fun logout() {
-        if (connectivityService.isNetworkAvailable() == true) {
+        if (isNetworkAvailable()) {
             try {
                 val response = api.logout()
                 if (!response.isSuccess) {
@@ -484,7 +481,7 @@ class Repository(
     suspend fun updateApiInformation() {
         val apiMajorVersion = appSettingsService.getApiVersion()
 
-        if (connectivityService.isNetworkAvailable() == true) {
+        if (isNetworkAvailable()) {
             val fetchedInformation = api.apiInformation()
             if (fetchedInformation.success && fetchedInformation.data != null) {
                 if (fetchedInformation.data.getApiMajorVersion() != apiMajorVersion) {
@@ -503,6 +500,8 @@ class Repository(
         }
     }
 
+    fun isNetworkAvailable() = isConnectionAvailable.value && !offlineOverride
+
     private fun getDBActions(): List<ACTION> = db.actionsQueries.actions().executeAsList()
 
     private fun deleteDBAction(action: ACTION) = db.actionsQueries.deleteAction(action.id)

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/service/ConnectivityService.kt

@@ -1,42 +0,0 @@
-package bou.amine.apps.readerforselfossv2.service
-
-import dev.jordond.connectivity.Connectivity
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
-import kotlinx.coroutines.launch
-
-class ConnectivityService {
-    private val _networkAvailableProvider = MutableSharedFlow<Boolean>()
-    val networkAvailableProvider = _networkAvailableProvider.asSharedFlow()
-    private var currentStatus: Boolean? = null
-    private lateinit var connectivity: Connectivity
-
-    fun start() {
-        connectivity = Connectivity()
-        connectivity.start()
-        CoroutineScope(Dispatchers.Main).launch {
-            connectivity.statusUpdates.collect { status ->
-                when (status) {
-                    is Connectivity.Status.Connected -> {
-                        currentStatus = true
-                        _networkAvailableProvider.emit(true)
-                    }
-
-                    is Connectivity.Status.Disconnected -> {
-                        currentStatus = false
-                        _networkAvailableProvider.emit(false)
-                    }
-                }
-            }
-        }
-    }
-
-    fun isNetworkAvailable(): Boolean? = currentStatus
-
-    fun stop() {
-        currentStatus = null
-        connectivity.stop()
-    }
-}