androidApp/build.gradle.kts

@@ -181,9 +181,8 @@ dependencies {
     implementation("androidx.viewpager2:viewpager2:1.1.0-beta01")
 
     //Dependency Injection
-    implementation("org.kodein.di:kodein-di:7.14.0")
+    implementation("org.kodein.di:kodein-di:7.12.0")
-    implementation("org.kodein.di:kodein-di-framework-android-x:7.14.0")
+    implementation("org.kodein.di:kodein-di-framework-android-x:7.12.0")
-    implementation("org.kodein.di:kodein-di-framework-android-x-viewmodel:7.14.0")
 
     //Settings
     implementation("com.russhwolf:multiplatform-settings-no-arg:0.9")
@@ -194,18 +193,13 @@ 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-livedata-ktx:2.4.0")
-    implementation("androidx.lifecycle:lifecycle-common-java8:2.5.1")
+    implementation("androidx.lifecycle:lifecycle-common-java8:2.4.0")
-    implementation("androidx.lifecycle:lifecycle-runtime:2.5.1")
-    implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
 
     implementation("androidx.room:room-ktx:2.4.0-beta01")
     kapt("androidx.room:room-compiler:2.4.0-beta01")
 
     implementation("android.arch.work:work-runtime-ktx:1.0.1")
-
-    // Network information
-     implementation("com.github.ln-12:multiplatform-connectivity-status:1.3.0")
 }

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

@@ -44,9 +44,9 @@ import bou.amine.apps.readerforselfossv2.android.utils.Config
 import bou.amine.apps.readerforselfossv2.android.utils.bottombar.maybeShow
 import bou.amine.apps.readerforselfossv2.android.utils.bottombar.removeBadge
 import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
+import bou.amine.apps.readerforselfossv2.android.utils.network.isNetworkAvailable
 import bou.amine.apps.readerforselfossv2.android.utils.persistence.toEntity
 import bou.amine.apps.readerforselfossv2.android.utils.persistence.toView
-import bou.amine.apps.readerforselfossv2.android.viewmodel.AppViewModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.rest.SelfossModel
 import bou.amine.apps.readerforselfossv2.utils.ItemType
@@ -126,6 +126,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     private var recyclerAdapter: RecyclerView.Adapter<*>? = null
 
     private var fromTabShortcut: Boolean = false
+    private var offlineShortcut: Boolean = false
 
     private lateinit var tagsBadge: Map<Long, Int>
 
@@ -152,7 +153,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         val view = binding.root
 
         fromTabShortcut =  intent.getIntExtra("shortcutTab", -1) != -1
-        repository.offlineOverride =  intent.getBooleanExtra("startOffline", false)
+        offlineShortcut =  intent.getBooleanExtra("startOffline", false)
 
         if (fromTabShortcut) {
             elementsShown = ItemType.fromInt(intent.getIntExtra("shortcutTab", ItemType.UNREAD.position))
@@ -174,6 +175,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             AppDatabase::class.java, "selfoss-database"
         ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).addMigrations(MIGRATION_3_4).build()
 
+
         customTabActivityHelper = CustomTabActivityHelper()
 
         dataBase = AndroidDeviceDatabase(applicationContext)
@@ -195,7 +197,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             R.color.refresh_progress_3
         )
         binding.swipeRefreshLayout.setOnRefreshListener {
-            repository.offlineOverride = false
+            offlineShortcut = false
             lastFetchDone = false
             handleDrawerItems()
             CoroutineScope(Dispatchers.Main).launch {
@@ -687,6 +689,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             var sources: List<SelfossModel.Source>?
 
             fun sourcesApiCall() {
+                if (this@HomeActivity.isNetworkAvailable(null, offlineShortcut) && updateSources) {
                     CoroutineScope(Dispatchers.Main).launch {
                         val response = repository.getSources()
                         if (response != null) {
@@ -703,12 +706,15 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                         }
                     }
                 }
+            }
 
+            if (this@HomeActivity.isNetworkAvailable(null, offlineShortcut) && updateSources) {
                 CoroutineScope(Dispatchers.IO).launch {
                     tags = repository.getTags()
                     sourcesApiCall()
                 }
             }
+        }
 
         binding.mainDrawer.itemAdapter.add(
             PrimaryDrawerItem().apply {
@@ -938,11 +944,13 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     private fun reloadBadges() {
         if (displayUnreadCount || displayAllCount) {
             CoroutineScope(Dispatchers.Main).launch {
+                if (applicationContext.isNetworkAvailable()) {
                     repository.reloadBadges()
                     reloadBadgeContent()
                 }
             }
         }
+    }
 
     private fun reloadBadgeContent() {
         if (displayUnreadCount) {
@@ -1013,13 +1021,13 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.refresh -> {
+                if (this@HomeActivity.isNetworkAvailable(null, offlineShortcut)) {
                     needsConfirmation(R.string.menu_home_refresh, R.string.refresh_dialog_message) {
                         Toast.makeText(this, R.string.refresh_in_progress, Toast.LENGTH_SHORT).show()
                         // TODO: Use Dispatchers.IO
                         CoroutineScope(Dispatchers.Main).launch {
                             val updatedRemote = repository.updateRemote()
                             if (updatedRemote) {
-                            // TODO: Send toast messages from the repository
                                 Toast.makeText(
                                     this@HomeActivity,
                                     R.string.refresh_success_response, Toast.LENGTH_LONG
@@ -1035,12 +1043,16 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                         }
                     }
                     return true
+                } else {
+                    return false
+                }
             }
             R.id.readAll -> {
                 if (elementsShown == ItemType.UNREAD) {
                     needsConfirmation(R.string.readAll, R.string.markall_dialog_message) {
                         binding.swipeRefreshLayout.isRefreshing = true
 
+                        if (this@HomeActivity.isNetworkAvailable(null, offlineShortcut)) {
                             CoroutineScope(Dispatchers.Main).launch {
                                 val success = repository.markAllAsRead(items)
                                 if (success) {
@@ -1066,6 +1078,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                             }
                         }
                     }
+                }
                 return true
             }
             R.id.action_disconnect -> {
@@ -1114,6 +1127,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             }
         }
 
+        if (this@HomeActivity.isNetworkAvailable(null, offlineShortcut)) {
             CoroutineScope(Dispatchers.Main).launch {
                 val actions = db.actionsDao().actions()
 
@@ -1127,5 +1141,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                 }
             }
         }
+    }
 }
 

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

@@ -15,6 +15,7 @@ import androidx.appcompat.app.AppCompatActivity
 import bou.amine.apps.readerforselfossv2.android.databinding.ActivityLoginBinding
 import bou.amine.apps.readerforselfossv2.android.themes.AppColors
 import bou.amine.apps.readerforselfossv2.android.utils.isBaseUrlValid
+import bou.amine.apps.readerforselfossv2.android.utils.network.isNetworkAvailable
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import com.mikepenz.aboutlibraries.LibsBuilder
 import com.russhwolf.settings.Settings
@@ -201,6 +202,7 @@ class LoginActivity() : AppCompatActivity(), DIAware {
 
             repository.refreshLoginInformation(url, login, password, httpLogin, httpPassword, isWithSelfSignedCert)
 
+            if (this@LoginActivity.isNetworkAvailable(this@LoginActivity.findViewById(R.id.loginForm))) {
                 CoroutineScope(Dispatchers.IO).launch {
                     val result = repository.login()
                     if (result) {
@@ -211,6 +213,7 @@ class LoginActivity() : AppCompatActivity(), DIAware {
                         }
                     }
                 }
+            }
             showProgress(false)
         }
     }

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

@@ -7,28 +7,18 @@ import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Build
 import android.widget.ImageView
-import android.widget.Toast
-import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.ProcessLifecycleOwner
-import androidx.lifecycle.lifecycleScope
 import androidx.multidex.MultiDexApplication
 import androidx.preference.PreferenceManager
 import bou.amine.apps.readerforselfossv2.DI.networkModule
 import bou.amine.apps.readerforselfossv2.android.utils.Config
 import bou.amine.apps.readerforselfossv2.android.utils.glide.loadMaybeBasicAuth
-import bou.amine.apps.readerforselfossv2.android.viewmodel.AppViewModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
 import com.ftinc.scoop.Scoop
-import com.github.ln_12.library.ConnectivityStatus
 import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
 import com.mikepenz.materialdrawer.util.DrawerImageLoader
 import com.russhwolf.settings.Settings
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import io.github.aakira.napier.DebugAntilog
 import io.github.aakira.napier.Napier
 import org.kodein.di.*
@@ -37,14 +27,9 @@ class MyApp : MultiDexApplication(), DIAware {
 
     override val di by DI.lazy {
         import(networkModule)
-        bind<Repository>() with singleton { Repository(instance(), instance(), connectivityStatus) }
+        bind<Repository>() with singleton { Repository(instance(), 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 lateinit var config: Config
     private lateinit var settings : Settings
 
@@ -61,18 +46,6 @@ class MyApp : MultiDexApplication(), DIAware {
         tryToHandleBug()
 
         handleNotificationChannels()
-
-        ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifeCycleObserver(connectivityStatus, repository))
-
-        CoroutineScope(Dispatchers.Main).launch {
-            viewModel.toastMessageProvider.collect { toastMessage ->
-                Toast.makeText(
-                    applicationContext,
-                    toastMessage,
-                    Toast.LENGTH_SHORT
-                ).show()
-            }
-        }
     }
 
     private fun handleNotificationChannels() {
@@ -132,19 +105,4 @@ class MyApp : MultiDexApplication(), DIAware {
             }
         }
     }
-
-    class AppLifeCycleObserver(val connectivityStatus: ConnectivityStatus, val repository: Repository) : DefaultLifecycleObserver {
-
-        override fun onResume(owner: LifecycleOwner) {
-            super.onResume(owner)
-            repository.connectionMonitored = true
-            connectivityStatus.start()
-        }
-
-        override fun onPause(owner: LifecycleOwner) {
-            repository.connectionMonitored = false
-            connectivityStatus.stop()
-            super.onPause(owner)
-        }
-    }
 }

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

@@ -10,6 +10,7 @@ import bou.amine.apps.readerforselfossv2.android.adapters.SourcesListAdapter
 import bou.amine.apps.readerforselfossv2.android.databinding.ActivitySourcesBinding
 import bou.amine.apps.readerforselfossv2.android.themes.AppColors
 import bou.amine.apps.readerforselfossv2.android.themes.Toppings
+import bou.amine.apps.readerforselfossv2.android.utils.network.isNetworkAvailable
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.rest.SelfossModel
 import com.ftinc.scoop.Scoop
@@ -63,6 +64,7 @@ class SourcesActivity : AppCompatActivity(), DIAware {
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = mLayoutManager
 
+        if (this@SourcesActivity.isNetworkAvailable(binding.recyclerView)) {
             CoroutineScope(Dispatchers.Main).launch {
                 val response = repository.getSources()
                 if (response != null) {
@@ -87,6 +89,7 @@ class SourcesActivity : AppCompatActivity(), DIAware {
                     ).show()
                 }
             }
+        }
 
         binding.fab.setOnClickListener {
             startActivity(Intent(this@SourcesActivity, AddSourceActivity::class.java))

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

@@ -16,6 +16,7 @@ import bou.amine.apps.readerforselfossv2.android.utils.*
 import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
 import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapCenterCrop
 import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
+import bou.amine.apps.readerforselfossv2.android.utils.network.isNetworkAvailable
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.rest.SelfossModel
 import com.amulyakhare.textdrawable.TextDrawable
@@ -109,6 +110,7 @@ class ItemCardAdapter(
 
             binding.favButton.setOnClickListener {
                 val item = items[bindingAdapterPosition]
+                if (c.isNetworkAvailable()) {
                     if (item.starred) {
                         CoroutineScope(Dispatchers.IO).launch {
                             repository.unstarr(item)
@@ -125,6 +127,7 @@ class ItemCardAdapter(
                         binding.favButton.isSelected = true
                     }
                 }
+            }
 
                 binding.shareBtn.setOnClickListener {
                     val item = items[bindingAdapterPosition]

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

@@ -14,6 +14,7 @@ import bou.amine.apps.readerforselfossv2.android.model.getIcon
 import bou.amine.apps.readerforselfossv2.android.model.getTitleDecoded
 import bou.amine.apps.readerforselfossv2.android.utils.Config
 import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
+import bou.amine.apps.readerforselfossv2.android.utils.network.isNetworkAvailable
 import bou.amine.apps.readerforselfossv2.android.utils.toTextDrawableString
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.rest.SelfossModel
@@ -77,6 +78,7 @@ class SourcesListAdapter(
             val deleteBtn: Button = mView.findViewById(R.id.deleteBtn)
 
             deleteBtn.setOnClickListener {
+                if (c.isNetworkAvailable(null)) {
                     val (id) = items[adapterPosition]
                     CoroutineScope(Dispatchers.IO).launch {
                         val successfullyDeletedSource = repository.deleteSource(id)
@@ -95,4 +97,5 @@ class SourcesListAdapter(
                 }
             }
         }
+    }
 }

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

@@ -21,7 +21,7 @@ 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.android.utils.network.isNetworkAvailable
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.rest.SelfossModel
 import bou.amine.apps.readerforselfossv2.utils.ItemType
@@ -44,7 +44,9 @@ 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) {
+
+        if (context.isNetworkAvailable()) {
 
             CoroutineScope(Dispatchers.IO).launch {
                 val notificationManager =
@@ -92,6 +94,7 @@ override fun doWork(): Result {
                     }
                 }
 
+                if (context.isNetworkAvailable()) {
                     launch {
                         try {
                             val newItems = repository.allItems(ItemType.UNREAD)
@@ -103,6 +106,8 @@ override fun doWork(): Result {
                     }
                 }
             }
+        }
+    }
     return Result.success()
 }
 

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

@@ -35,6 +35,7 @@ import bou.amine.apps.readerforselfossv2.android.utils.*
 import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
 import bou.amine.apps.readerforselfossv2.android.utils.glide.getBitmapInputStream
 import bou.amine.apps.readerforselfossv2.android.utils.glide.loadMaybeBasicAuth
+import bou.amine.apps.readerforselfossv2.android.utils.network.isNetworkAvailable
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.rest.SelfossModel
 import bou.amine.apps.readerforselfossv2.utils.isEmptyOrNullOrNullString
@@ -275,7 +276,7 @@ class ArticleFragment : Fragment(), DIAware {
     }
 
     private fun getContentFromMercury(customTabsIntent: CustomTabsIntent) {
-        if (repository.isNetworkAvailable()) {
+        if ((context != null && requireContext().isNetworkAvailable(null)) || context == null) {
             binding.progressBar.visibility = View.VISIBLE
             val parser = MercuryApi()
 
@@ -316,10 +317,7 @@ class ArticleFragment : Fragment(), DIAware {
                                             Glide
                                                 .with(requireContext())
                                                 .asBitmap()
-                                                .loadMaybeBasicAuth(
+                                                .loadMaybeBasicAuth(config, response.body()!!.lead_image_url.orEmpty())
-                                                    config,
-                                                    response.body()!!.lead_image_url.orEmpty()
-                                                )
                                                 .apply(RequestOptions.fitCenterTransform())
                                                 .into(binding.imageView)
                                         } catch (e: Exception) {

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

@@ -1,14 +1,52 @@
 package bou.amine.apps.readerforselfossv2.android.utils.network
 
 import android.content.Context
+import android.graphics.Color
 import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
 import android.os.Build
+import android.view.View
+import android.widget.TextView
+import bou.amine.apps.readerforselfossv2.android.R
 import com.google.android.material.snackbar.Snackbar
 
+var snackBarShown = false
+var view: View? = null
 lateinit var s: Snackbar
 
-fun isNetworkAccessible(context: Context): Boolean {
+fun Context.isNetworkAvailable(
+    v: View? = null,
+    overrideOffline: Boolean = false
+): Boolean {
+    val networkIsAccessible = isNetworkAccessible(this)
+
+    if (v != null && (!networkIsAccessible || overrideOffline) && (!snackBarShown || v != view)) {
+        view = v
+        s = Snackbar
+            .make(
+                v,
+                R.string.no_network_connectivity,
+                Snackbar.LENGTH_INDEFINITE
+            )
+
+        s.setAction(android.R.string.ok) {
+            snackBarShown = false
+            s.dismiss()
+        }
+
+        val view = s.view
+        val tv: TextView = view.findViewById(com.google.android.material.R.id.snackbar_text)
+        tv.setTextColor(Color.WHITE)
+        s.show()
+        snackBarShown = true
+    }
+    if (snackBarShown && networkIsAccessible && !overrideOffline) {
+        s.dismiss()
+    }
+    return if(overrideOffline) overrideOffline else networkIsAccessible
+}
+
+private fun isNetworkAccessible(context: Context): Boolean {
     val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {

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

@@ -1,29 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.viewmodel
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import bou.amine.apps.readerforselfossv2.android.R
-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 _toastMessageProvider = MutableSharedFlow<Int>()
-    val toastMessageProvider = _toastMessageProvider.asSharedFlow()
-    private var wasConnected = true
-
-    init {
-        viewModelScope.launch {
-            repository.isConnectionAvailable.collect { isConnected ->
-                if (isConnected && !wasConnected && repository.connectionMonitored) {
-                    _toastMessageProvider.emit(R.string.network_connectivity_retrieved)
-                    wasConnected = true
-                } else if (!isConnected && wasConnected && repository.connectionMonitored){
-                    _toastMessageProvider.emit(R.string.network_connectivity_lost)
-                    wasConnected = false
-                }
-            }
-        }
-    }
-}

androidApp/src/main/res/values/strings.xml

@@ -143,8 +143,6 @@
     <string name="pref_switch_update_sources">Check for new sources and tags</string>
     <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
     <string name="no_network_connectivity">Not connected !</string>
-    <string name="network_connectivity_lost">"Network connection lost"</string>
-    <string name="network_connectivity_retrieved">"Network connection is now available"</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
     <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>

shared/build.gradle.kts

@@ -36,9 +36,6 @@ kotlin {
 
                 //Logging
                 implementation("io.github.aakira:napier:2.6.1")
-
-                // Network information
-                implementation("com.github.ln-12:multiplatform-connectivity-status:1.3.0")
             }
         }
         val commonTest by getting {

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

@@ -5,19 +5,16 @@ import bou.amine.apps.readerforselfossv2.rest.SelfossModel
 import bou.amine.apps.readerforselfossv2.service.ApiDetailsService
 import bou.amine.apps.readerforselfossv2.utils.DateUtils
 import bou.amine.apps.readerforselfossv2.utils.ItemType
-import com.github.ln_12.library.ConnectivityStatus
 import com.russhwolf.settings.Settings
 import io.github.aakira.napier.Napier
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 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) {
     val settings = Settings()
 
     var items = ArrayList<SelfossModel.Item>()
-    val isConnectionAvailable = connectivityStatus.isNetworkConnected
-    var connectionMonitored = false
 
     var baseUrl = apiDetails.getBaseUrl()
     lateinit var dateUtils: DateUtils
@@ -29,7 +26,6 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
     var searchFilter: String? = null
 
     var itemsCaching = settings.getBoolean("items_caching", false)
-    var offlineOverride = false
 
     var apiMajorVersion = 0
     var badgeUnread = 0
@@ -49,21 +45,14 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
     }
 
     suspend fun getNewerItems(): ArrayList<SelfossModel.Item> {
-        // TODO: Use the updatedSince parameter
+        // TODO: Check connectivity, use the updatedSince parameter
-        var fetchedItems: List<SelfossModel.Item>? = null
+        val fetchedItems = api.getItems(displayedItems.type,
-        if (isNetworkAvailable()) {
-            fetchedItems = api.getItems(
-                displayedItems.type,
             settings.getString("prefer_api_items_number", "200").toInt(),
             offset = 0,
             tagFilter?.tag,
             sourceFilter?.id?.toLong(),
             searchFilter,
-                null
+            null)
-            )
-        } else {
-            // TODO: Get items from the database
-        }
 
         if (fetchedItems != null) {
             items = ArrayList(fetchedItems)
@@ -72,21 +61,15 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
     }
 
     suspend fun getOlderItems(): ArrayList<SelfossModel.Item> {
-        var fetchedItems: List<SelfossModel.Item>? = null
+        // TODO: Check connectivity
-        if (isNetworkAvailable()) {
         val offset = items.size
-            fetchedItems = api.getItems(
+        val fetchedItems = api.getItems(displayedItems.type,
-                displayedItems.type,
             settings.getString("prefer_api_items_number", "200").toInt(),
             offset,
             tagFilter?.tag,
             sourceFilter?.id?.toLong(),
             searchFilter,
-                null
+            null)
-            )
-        } else {
-            // TODO: Get items from the database
-        }
 
         if (fetchedItems != null) {
             appendItems(fetchedItems)
@@ -94,22 +77,8 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
         return items
     }
 
-    suspend fun allItems(itemType: ItemType): List<SelfossModel.Item>? {
+    suspend fun allItems(itemType: ItemType): List<SelfossModel.Item>? =
-        return if (isNetworkAvailable()) {
+        api.getItems(itemType.type, 200, 0, tagFilter?.tag, sourceFilter?.id?.toLong(), searchFilter, null)
-            api.getItems(
-                itemType.type,
-                200,
-                0,
-                tagFilter?.tag,
-                sourceFilter?.id?.toLong(),
-                searchFilter,
-                null
-            )
-        } else {
-            // TODO: Provide an error message
-            null
-        }
-    }
 
     private fun appendItems(fetchedItems: List<SelfossModel.Item>) {
         // TODO: Store in DB if enabled by user
@@ -125,8 +94,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 (isNetworkAvailable()) {
         val response = api.stats()
         if (response != null) {
             badgeUnread = response.unread
@@ -134,43 +103,26 @@ 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: Store in DB
+        // TODO: Check success, store in DB
-        return if (isNetworkAvailable()) {
+        return api.tags()
-            api.tags()
-        } else {
-            // TODO: Compute from database
-            null
-        }
     }
 
     suspend fun getSpouts(): Map<String, SelfossModel.Spout>? {
-        // TODO: Store in DB
+        // TODO: Check success, store in DB
-        return if (isNetworkAvailable()) {
+        return api.spouts()
-            api.spouts()
-        } else {
-            // TODO: Compute from database
-            null
-        }
     }
 
     suspend fun getSources(): ArrayList<SelfossModel.Source>? {
-        // TODO: Store in DB
+        // TODO: Check success
-        return if (isNetworkAvailable()) {
+        return api.sources()
-            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) {
@@ -179,9 +131,10 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
         return success
     }
 
-    suspend fun markAsReadById(id: Int): Boolean =
+    suspend fun markAsReadById(id: Int): Boolean {
-        isNetworkAvailable() && api.markAsRead(id.toString())?.isSuccess == true
+        // TODO: Check internet connection
-
+        return api.markAsRead(id.toString())?.isSuccess == true
+    }
 
     suspend fun unmarkAsRead(item: SelfossModel.Item): Boolean {
         val success = unmarkAsReadById(item.id)
@@ -192,8 +145,10 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
         return success
     }
 
-    suspend fun unmarkAsReadById(id: Int): Boolean =
+    suspend fun unmarkAsReadById(id: Int): Boolean {
-        isNetworkAvailable() && api.unmarkAsRead(id.toString())?.isSuccess == true
+        // TODO: Check internet connection
+        return api.unmarkAsRead(id.toString())?.isSuccess == true
+    }
 
     suspend fun starr(item: SelfossModel.Item): Boolean {
         val success = starrById(item.id)
@@ -204,8 +159,10 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
         return success
     }
 
-    suspend fun starrById(id: Int): Boolean =
+    suspend fun starrById(id: Int): Boolean {
-        isNetworkAvailable() && api.starr(id.toString())?.isSuccess == true
+        // TODO: Check success, store in DB
+        return api.starr(id.toString())?.isSuccess == true
+    }
 
     suspend fun unstarr(item: SelfossModel.Item): Boolean {
         val success = unstarrById(item.id)
@@ -216,15 +173,17 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
         return success
     }
 
-    suspend fun unstarrById(id: Int): Boolean =
+    suspend fun unstarrById(id: Int): Boolean {
-        isNetworkAvailable() && api.unstarr(id.toString())?.isSuccess == true
+        // TODO: Check internet connection
-
+        return api.unstarr(id.toString())?.isSuccess == true
+    }
 
     suspend fun markAllAsRead(items: ArrayList<SelfossModel.Item>): Boolean {
-        var success = false
+        // TODO: Check Internet connectivity, store in DB
 
-        if (isNetworkAvailable() && api.markAllAsRead(items.map { it.id.toString() })?.isSuccess == true) {
+        val success = api.markAllAsRead(items.map { it.id.toString() })?.isSuccess == true
-            success = true
+
+        if (success) {
             for (item in items) {
                 markAsReadLocally(item)
             }
@@ -271,46 +230,45 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
         tags: String,
         filter: String
     ): Boolean {
-        var response = false
+        // TODO: Check connectivity
-        if (isNetworkAvailable()) {
+        val response = api.createSourceForVersion(
-            response = api.createSourceForVersion(
             title,
             url,
             spout,
             tags,
             filter,
             apiMajorVersion
-            )?.isSuccess == true
+        )
-        }
 
-        return response
+        return response != null
     }
 
     suspend fun deleteSource(id: Int): Boolean {
-        // TODO: Store in DB
+        // TODO: Check connectivity, store in DB
         var success = false
-        if (isNetworkAvailable()) {
         val response = api.deleteSource(id)
         if (response != null) {
             success = response.isSuccess
         }
-        }
 
         return success
     }
 
-    suspend fun updateRemote(): Boolean =
+    suspend fun updateRemote(): Boolean {
-        isNetworkAvailable() && api.update()?.isSuccess == true
+        // TODO: Handle connectivity issues
+        val response = api.update()
+        return response?.isSuccess ?: false
+    }
 
     suspend fun login(): Boolean {
         var result = false
-        if (isNetworkAvailable()) {
         try {
             val response = api.login()
-                result = response?.isSuccess == true
+            if (response != null && response.isSuccess) {
-            } catch (cause: Throwable) {
+                result = true
-                Napier.e(cause.stackTraceToString(), tag = "RepositoryImpl.updateRemote")
             }
+        } catch (cause: Throwable) {
+            Napier.e(cause.stackTraceToString(),tag = "RepositoryImpl.updateRemote")
         }
         return result
     }
@@ -329,18 +287,15 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
     }
 
     private suspend fun updateApiVersion() {
-        apiMajorVersion = settings.getInt("apiVersionMajor", 0)
+        // TODO: Handle connectivity issues
-
-        if (isNetworkAvailable()) {
         val fetchedVersion = api.version()
         if (fetchedVersion != null) {
             apiMajorVersion = fetchedVersion.getApiMajorVersion()
             settings.putInt("apiVersionMajor", apiMajorVersion)
+        } else {
+            apiMajorVersion = settings.getInt("apiVersionMajor", 0)
         }
     }
-    }
-
-    fun isNetworkAvailable() = isConnectionAvailable.value && !offlineOverride
 
     // TODO: Handle offline actions
 }