Don't send toast messages from the repository

Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/30

androidApp/build.gradle.kts

@@ -190,13 +190,18 @@ dependencies {
     //PhotoView
     implementation("com.github.chrisbanes:PhotoView:2.3.0")
 
-    implementation("androidx.core:core-ktx:1.7.0")
+    implementation("androidx.core:core-ktx:1.8.0")
 
-    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.4.0")
-    implementation("androidx.lifecycle:lifecycle-common-java8:2.4.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.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.1.0")
 }

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

@@ -44,7 +44,6 @@ 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.repository.Repository
@@ -126,7 +125,6 @@ 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>
 
@@ -153,7 +151,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         val view = binding.root
 
         fromTabShortcut =  intent.getIntExtra("shortcutTab", -1) != -1
-        offlineShortcut =  intent.getBooleanExtra("startOffline", false)
+        repository.offlineOverride =  intent.getBooleanExtra("startOffline", false)
 
         if (fromTabShortcut) {
             elementsShown = ItemType.fromInt(intent.getIntExtra("shortcutTab", ItemType.UNREAD.position))
@@ -197,7 +195,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             R.color.refresh_progress_3
         )
         binding.swipeRefreshLayout.setOnRefreshListener {
-            offlineShortcut = false
+            repository.offlineOverride = false
             lastFetchDone = false
             handleDrawerItems()
             CoroutineScope(Dispatchers.Main).launch {
@@ -408,6 +406,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
         val drawerListener = object : DrawerLayout.DrawerListener {
             override fun onDrawerSlide(drawerView: View, slideOffset: Float) {
+                // We do nothing
             }
 
             override fun onDrawerOpened(drawerView: View) {
@@ -419,6 +418,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             }
 
             override fun onDrawerStateChanged(newState: Int) {
+                // We do nothing
             }
 
         }
@@ -469,6 +469,45 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     private fun handleDrawerItems() {
         tagsBadge = emptyMap()
         fun handleDrawerData(maybeDrawerData: DrawerData?, loadedFromCache: Boolean = false) {
+            fun createDrawerItem(
+                it: SelfossModel.Tag
+            ) {
+                val gd = GradientDrawable()
+                val gdColor = try {
+                    Color.parseColor(it.color)
+                } catch (e: IllegalArgumentException) {
+                    appColors.colorPrimary
+                }
+
+                gd.setColor(gdColor)
+                gd.shape = GradientDrawable.RECTANGLE
+                gd.setSize(30, 30)
+                gd.cornerRadius = 30F
+
+                val drawerItem = PrimaryDrawerItem()
+                    .apply {
+                        nameText = it.getTitleDecoded()
+                        identifier = it.tag.longHash()
+                        iconDrawable = gd
+                        badgeStyle = BadgeStyle().apply {
+                            textColor = ColorHolder.fromColor(Color.WHITE)
+                            color = ColorHolder.fromColor(appColors.colorAccent)
+                        }
+                        onDrawerItemClickListener = { _, _, _ ->
+                            repository.tagFilter = it
+                            repository.sourceFilter = null
+                            getElementsAccordingToTab()
+                            fetchOnEmptyList()
+                            false
+                        }
+                    }
+                if (it.unread > 0) {
+                    drawerItem.badgeText = it.unread.toString()
+                }
+
+                binding.mainDrawer.itemAdapter.add(drawerItem)
+            }
+
             fun handleTags(maybeTags: List<SelfossModel.Tag>?) {
                 if (maybeTags == null) {
                     if (loadedFromCache) {
@@ -482,38 +521,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                         .filterNot { hiddenTags.contains(it.tag) }
                         .sortedBy { it.unread == 0 }
                     tagsBadge = filteredTags.map {
-                        val gd = GradientDrawable()
-                        val gdColor = try {
-                            Color.parseColor(it.color)
-                        } catch (e: IllegalArgumentException) {
-                            appColors.colorPrimary
-                        }
-
-                        gd.setColor(gdColor)
-                        gd.shape = GradientDrawable.RECTANGLE
-                        gd.setSize(30, 30)
-                        gd.cornerRadius = 30F
-                        val drawerItem =
-                            PrimaryDrawerItem()
-                                .apply {
-                                    nameText = it.getTitleDecoded()
-                                    identifier = it.tag.longHash()
-                                    iconDrawable = gd
-                                    badgeStyle = BadgeStyle().apply {
-                                        textColor = ColorHolder.fromColor(Color.WHITE)
-                                        color = ColorHolder.fromColor(appColors.colorAccent) }
-                                    onDrawerItemClickListener = { _,_,_ ->
-                                        repository.tagFilter = it
-                                        repository.sourceFilter = null
-                                        getElementsAccordingToTab()
-                                        fetchOnEmptyList()
-                                        false
-                                    } }
-                        if (it.unread > 0) {
-                            drawerItem.badgeText = it.unread.toString()
-                        }
-
-                        binding.mainDrawer.itemAdapter.add(drawerItem)
+                        createDrawerItem(it)
 
                         (it.tag.longHash() to it.unread)
                     }.toMap()
@@ -534,37 +542,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                     val filteredHiddenTags: List<SelfossModel.Tag> =
                         maybeTags.filter { hiddenTags.contains(it.tag) }
                     tagsBadge = filteredHiddenTags.map {
-                        val gd = GradientDrawable()
-                        val gdColor = try {
-                            Color.parseColor(it.color)
-                        } catch (e: IllegalArgumentException) {
-                            appColors.colorPrimary
-                        }
-
-                        gd.setColor(gdColor)
-                        gd.shape = GradientDrawable.RECTANGLE
-                        gd.setSize(30, 30)
-                        gd.cornerRadius = 30F
-                        val drawerItem =
-                            PrimaryDrawerItem().apply {
-                                nameText = it.getTitleDecoded()
-                                identifier = it.tag.longHash()
-                                iconDrawable = gd
-                                badgeStyle = BadgeStyle().apply {
-                                    textColor = ColorHolder.fromColor(Color.WHITE)
-                                    color = ColorHolder.fromColor(appColors.colorAccent) }
-                                onDrawerItemClickListener = { _,_,_ ->
-                                    repository.tagFilter = it
-                                    repository.sourceFilter = null
-                                    getElementsAccordingToTab()
-                                    fetchOnEmptyList()
-                                    false
-                                } }
-
-                        if (it.unread > 0) {
-                            drawerItem.badgeText = it.unread.toString()
-                        }
-                        binding.mainDrawer.itemAdapter.add(drawerItem)
+                        createDrawerItem(it)
 
                         (it.tag.longHash() to it.unread)
                     }.toMap()
@@ -709,7 +687,6 @@ 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) {
@@ -726,15 +703,12 @@ 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 {
@@ -964,13 +938,11 @@ 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) {
@@ -1041,13 +1013,14 @@ 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 {
+                        repository.offlineOverride = false
                         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
@@ -1063,16 +1036,12 @@ 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) {
@@ -1098,7 +1067,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                         }
                     }
                 }
-                }
                 return true
             }
             R.id.action_disconnect -> {
@@ -1147,7 +1115,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             }
         }
 
-        if (this@HomeActivity.isNetworkAvailable(null, offlineShortcut)) {
         CoroutineScope(Dispatchers.Main).launch {
             val actions = db.actionsDao().actions()
 
@@ -1162,5 +1129,4 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         }
     }
 }
-}
 

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

@@ -15,7 +15,6 @@ 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
@@ -202,7 +201,6 @@ 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) {
@@ -213,7 +211,6 @@ class LoginActivity() : AppCompatActivity(), DIAware {
                     }
                 }
             }
-            }
             showProgress(false)
         }
     }

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

@@ -7,6 +7,9 @@ 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
@@ -16,6 +19,7 @@ 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
@@ -25,9 +29,10 @@ class MyApp : MultiDexApplication(), DIAware {
 
     override val di by DI.lazy {
         import(networkModule)
-        bind<Repository>() with singleton { Repository(instance(), instance()) }
+        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
 
@@ -43,6 +48,8 @@ class MyApp : MultiDexApplication(), DIAware {
         tryToHandleBug()
 
         handleNotificationChannels()
+
+        ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifeCycleObserver(repository))
     }
 
     private fun handleNotificationChannels() {
@@ -102,4 +109,17 @@ 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/SourcesActivity.kt

@@ -10,7 +10,6 @@ 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
@@ -64,7 +63,6 @@ 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) {
@@ -89,7 +87,6 @@ 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,7 +16,6 @@ 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
@@ -110,7 +109,6 @@ class ItemCardAdapter(
 
             binding.favButton.setOnClickListener {
                 val item = items[bindingAdapterPosition]
-                if (c.isNetworkAvailable()) {
                 if (item.starred) {
                     CoroutineScope(Dispatchers.IO).launch {
                         repository.unstarr(item)
@@ -127,7 +125,6 @@ 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,7 +14,6 @@ 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
@@ -78,7 +77,6 @@ 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)
@@ -98,4 +96,3 @@ 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.isNetworkAvailable
+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,9 +44,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) {
-
-        if (context.isNetworkAvailable()) {
+    if (periodicRefresh && isNetworkAccessible(context)) {
 
         CoroutineScope(Dispatchers.IO).launch {
             val notificationManager =
@@ -94,7 +92,6 @@ override fun doWork(): Result {
                 }
             }
 
-                if (context.isNetworkAvailable()) {
             launch {
                 try {
                     val newItems = repository.allItems(ItemType.UNREAD)
@@ -106,8 +103,6 @@ override fun doWork(): Result {
             }
         }
     }
-        }
-    }
     return Result.success()
 }
 

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

@@ -35,7 +35,6 @@ 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
@@ -276,7 +275,7 @@ class ArticleFragment : Fragment(), DIAware {
     }
 
     private fun getContentFromMercury(customTabsIntent: CustomTabsIntent) {
-        if ((context != null && requireContext().isNetworkAvailable(null)) || context == null) {
+        if (repository.isNetworkAvailable()) {
         binding.progressBar.visibility = View.VISIBLE
         val parser = MercuryApi()
 
@@ -317,7 +316,10 @@ class ArticleFragment : Fragment(), DIAware {
                                             Glide
                                                 .with(requireContext())
                                                 .asBitmap()
-                                                .loadMaybeBasicAuth(config, response.body()!!.lead_image_url.orEmpty())
+                                                .loadMaybeBasicAuth(
+                                                    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,52 +1,14 @@
 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 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 {
+fun isNetworkAccessible(context: Context): Boolean {
     val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {

shared/build.gradle.kts

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

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

@@ -5,16 +5,18 @@ 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) {
+class Repository(private val api: SelfossApi, private val apiDetails: ApiDetailsService, val connectivityStatus: ConnectivityStatus) {
     val settings = Settings()
 
     var items = ArrayList<SelfossModel.Item>()
+    private val isConnectionAvailable = connectivityStatus.isNetworkConnected
 
     var baseUrl = apiDetails.getBaseUrl()
     lateinit var dateUtils: DateUtils
@@ -26,6 +28,7 @@ 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
@@ -45,14 +48,21 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
     }
 
     suspend fun getNewerItems(): ArrayList<SelfossModel.Item> {
-        // TODO: Check connectivity, use the updatedSince parameter
-        val fetchedItems = api.getItems(displayedItems.type,
+        // TODO: Use the updatedSince parameter
+        var fetchedItems: List<SelfossModel.Item>? = null
+        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)
@@ -61,15 +71,21 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
     }
 
     suspend fun getOlderItems(): ArrayList<SelfossModel.Item> {
-        // TODO: Check connectivity
+        var fetchedItems: List<SelfossModel.Item>? = null
+        if (isNetworkAvailable()) {
             val offset = items.size
-        val fetchedItems = api.getItems(displayedItems.type,
+            fetchedItems = api.getItems(
+                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)
@@ -77,8 +93,22 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
         return items
     }
 
-    suspend fun allItems(itemType: ItemType): List<SelfossModel.Item>? =
-        api.getItems(itemType.type, 200, 0, tagFilter?.tag, sourceFilter?.id?.toLong(), searchFilter, null)
+    suspend fun allItems(itemType: ItemType): List<SelfossModel.Item>? {
+        return if (isNetworkAvailable()) {
+            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
@@ -94,8 +124,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
@@ -103,26 +133,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
-        return api.tags()
+        // TODO: Store in DB
+        return if (isNetworkAvailable()) {
+            api.tags()
+        } else {
+            // TODO: Compute from database
+            null
+        }
     }
 
     suspend fun getSpouts(): Map<String, SelfossModel.Spout>? {
-        // TODO: Check success, store in DB
-        return api.spouts()
+        // TODO: Store in DB
+        return if (isNetworkAvailable()) {
+            api.spouts()
+        } else {
+            // TODO: Compute from database
+            null
+        }
     }
 
     suspend fun getSources(): ArrayList<SelfossModel.Source>? {
-        // TODO: Check success
-        return api.sources()
+        // TODO: Store in DB
+        return if (isNetworkAvailable()) {
+            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) {
@@ -132,8 +179,11 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
     }
 
     suspend fun markAsReadById(id: Int): Boolean {
-        // TODO: Check internet connection
-        return api.markAsRead(id.toString())?.isSuccess == true
+        var success = false
+        if (isNetworkAvailable()) {
+            success = api.markAsRead(id.toString())?.isSuccess == true
+        }
+        return success
     }
 
     suspend fun unmarkAsRead(item: SelfossModel.Item): Boolean {
@@ -146,8 +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 (isNetworkAvailable()) {
+            success = api.unmarkAsRead(id.toString())?.isSuccess == true
+        }
+        return success
     }
 
     suspend fun starr(item: SelfossModel.Item): Boolean {
@@ -160,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
-        return api.starr(id.toString())?.isSuccess == true
+        var success = false
+        if (isNetworkAvailable()) {
+            success = api.starr(id.toString())?.isSuccess == true
+        }
+        return success
     }
 
     suspend fun unstarr(item: SelfossModel.Item): Boolean {
@@ -174,14 +230,19 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
     }
 
     suspend fun unstarrById(id: Int): Boolean {
-        // TODO: Check internet connection
-        return api.unstarr(id.toString())?.isSuccess == true
+        var success = false
+        if (isNetworkAvailable()) {
+            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 (isNetworkAvailable()) {
+            success = api.markAllAsRead(items.map { it.id.toString() })?.isSuccess == true
+        }
 
         if (success) {
             for (item in items) {
@@ -230,46 +291,52 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
         tags: String,
         filter: String
     ): Boolean {
-        // TODO: Check connectivity
-        val response = api.createSourceForVersion(
+        var response = false
+        if (isNetworkAvailable()) {
+            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 (isNetworkAvailable()) {
             val response = api.deleteSource(id)
             if (response != null) {
                 success = response.isSuccess
             }
+        }
 
         return success
     }
 
     suspend fun updateRemote(): Boolean {
-        // TODO: Handle connectivity issues
-        val response = api.update()
-        return response?.isSuccess ?: false
+        var response = false
+        if (isConnectionAvailable.value) {
+            response = api.update()?.isSuccess == true
+        }
+        return response
     }
 
     suspend fun login(): Boolean {
         var result = false
+        if (isNetworkAvailable()) {
             try {
                 val response = api.login()
-            if (response != null && response.isSuccess) {
-                result = true
-            }
+                result = response?.isSuccess == true
             } catch (cause: Throwable) {
                 Napier.e(cause.stackTraceToString(), tag = "RepositoryImpl.updateRemote")
             }
+        }
         return result
     }
 
@@ -287,15 +354,26 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
     }
 
     private suspend fun updateApiVersion() {
-        // TODO: Handle connectivity issues
+        apiMajorVersion = settings.getInt("apiVersionMajor", 0)
+
+        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
+
+    fun startNetwork() {
+        connectivityStatus.start()
+    }
+
+    fun stopNetwork() {
+        connectivityStatus.stop()
+    }
 
     // TODO: Handle offline actions
 }