androidApp/build.gradle.kts

@@ -190,12 +190,10 @@ dependencies {
     //PhotoView
     implementation("com.github.chrisbanes:PhotoView:2.3.0")
 
-    implementation("androidx.core:core-ktx:1.8.0")
+    implementation("androidx.core:core-ktx:1.7.0")
 
-    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1")
-    implementation("androidx.lifecycle:lifecycle-common-java8:2.5.1")
-    implementation("androidx.lifecycle:lifecycle-runtime:2.5.1")
-    implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
+    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.4.0")
+    implementation("androidx.lifecycle:lifecycle-common-java8:2.4.0")
 
     implementation("androidx.room:room-ktx:2.4.0-beta01")
     kapt("androidx.room:room-compiler:2.4.0-beta01")

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

@@ -7,9 +7,6 @@ import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Build
 import android.widget.ImageView
-import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.multidex.MultiDexApplication
 import androidx.preference.PreferenceManager
 import bou.amine.apps.readerforselfossv2.DI.networkModule
@@ -32,7 +29,6 @@ class MyApp : MultiDexApplication(), DIAware {
         bind<Repository>() with singleton { Repository(instance(), instance(), ConnectivityStatus(applicationContext)) }
     }
 
-    private val repository: Repository by instance()
     private lateinit var config: Config
     private lateinit var settings : Settings
 
@@ -48,8 +44,6 @@ class MyApp : MultiDexApplication(), DIAware {
         tryToHandleBug()
 
         handleNotificationChannels()
-
-        ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifeCycleObserver(repository))
     }
 
     private fun handleNotificationChannels() {
@@ -109,17 +103,4 @@ class MyApp : MultiDexApplication(), DIAware {
             }
         }
     }
-
-    class AppLifeCycleObserver(val repository: Repository) : DefaultLifecycleObserver {
-
-        override fun onResume(owner: LifecycleOwner) {
-            super.onResume(owner)
-            repository.startNetwork()
-        }
-
-        override fun onPause(owner: LifecycleOwner) {
-            repository.stopNetwork()
-            super.onPause(owner)
-        }
-    }
 }

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

@@ -21,7 +21,6 @@ import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATIO
 import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_2_3
 import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_3_4
 import bou.amine.apps.readerforselfossv2.android.utils.Config
-import bou.amine.apps.readerforselfossv2.android.utils.network.isNetworkAccessible
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.rest.SelfossModel
 import bou.amine.apps.readerforselfossv2.utils.ItemType
@@ -44,7 +43,7 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con
 override fun doWork(): Result {
     val settings = Settings()
     val periodicRefresh = settings.getBoolean("periodic_refresh", false)
-    if (periodicRefresh && isNetworkAccessible(context)) {
+    if (periodicRefresh && repository.isNetworkAvailable()) {
 
         CoroutineScope(Dispatchers.IO).launch {
             val notificationManager =

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

@@ -275,10 +275,10 @@ class ArticleFragment : Fragment(), DIAware {
     }
 
     private fun getContentFromMercury(customTabsIntent: CustomTabsIntent) {
-        if (repository.isNetworkAvailable()) {
         binding.progressBar.visibility = View.VISIBLE
         val parser = MercuryApi()
 
+        if (repository.isNetworkAvailable()) {
             parser.parseUrl(url).enqueue(
                 object : Callback<ParsedContent> {
                     override fun onResponse(

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/network/NetworkUtils.kt

@@ -46,7 +46,7 @@ fun Context.isNetworkAvailable(
     return if(overrideOffline) overrideOffline else networkIsAccessible
 }
 
-fun isNetworkAccessible(context: Context): Boolean {
+private fun isNetworkAccessible(context: Context): Boolean {
     val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {

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

@@ -15,7 +15,7 @@ import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 
-class Repository(private val api: SelfossApi, private val apiDetails: ApiDetailsService, val connectivityStatus: ConnectivityStatus) {
+class Repository(private val api: SelfossApi, private val apiDetails: ApiDetailsService, connectivityStatus: ConnectivityStatus) {
     val settings = Settings()
 
     var items = ArrayList<SelfossModel.Item>()
@@ -45,6 +45,7 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
     set(value) {field = if (value < 0) { 0 } else { value } }
 
     init {
+        connectivityStatus.start()
         // TODO: Dispatchers.IO not available in KMM, an alternative solution should be found
         CoroutineScope(Dispatchers.Main).launch {
             updateApiVersion()
@@ -378,13 +379,5 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
 
     fun isNetworkAvailable() = isConnectionAvailable.value && !offlineOverride
 
-    fun startNetwork() {
-        connectivityStatus.start()
-    }
-
-    fun stopNetwork() {
-        connectivityStatus.stop()
-    }
-
     // TODO: Handle offline actions
 }