@@ -36,6 +38,7 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
     set(value) {field = if (value < 0) { 0 } else { value } }
 
     init {
+        networkStatus.start()

@@ -59,0 +60,4 @@
+                null
+            )
+
+            if (fetchedItems != null) {

@@ -59,0 +64,4 @@
+                items = ArrayList(fetchedItems)
+            }
+        } else {
+            // TODO: Provide an error message if the connection is not available.

@@ -82,0 +104,4 @@
+                null
+            )
+        } else {
+            null

@@ -95,3 +91,3 @@
                 }
+            }
 
-                if (context.isNetworkAvailable()) {

@@ -46,65 +45,60 @@ override fun doWork(): Result {
     val periodicRefresh = settings.getBoolean("periodic_refresh", false)
     if (periodicRefresh) {
 
-        if (context.isNetworkAvailable()) {

@@ -276,89 +275,87 @@ class ArticleFragment : Fragment(), DIAware {
     }
 
     private fun getContentFromMercury(customTabsIntent: CustomTabsIntent) {
-        if ((context != null && requireContext().isNetworkAvailable(null)) || context == null) {

@@ -57,2 +52,2 @@
-        if (fetchedItems != null) {
-            items = ArrayList(fetchedItems)
+        // TODO: Use the updatedSince parameter
+        if (isConnectionAvailable.value && !offlineOverride) {

@@ -59,0 +61,4 @@
+                null
+            )
+
+            if (fetchedItems != null) {

@@ -76,0 +84,4 @@
+                null
+            )
+
+            if (fetchedItems != null) {

@@ -137,3 +186,4 @@
     }
 
     suspend fun unmarkAsRead(item: SelfossModel.Item): Boolean {
+        // TODO: Check internet connection

@@ -259,2 +324,2 @@
-        val response = api.update()
-        return response?.isSuccess ?: false
+        var response = false
+        offlineOverride = false

@@ -180,6 +179,12 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
         dataBase = AndroidDeviceDatabase(applicationContext)
 
+        lifecycleScope.launch {

@@ -1063,0 +1044,4 @@
+                    Toast.makeText(this, R.string.refresh_in_progress, Toast.LENGTH_SHORT).show()
+                    // TODO: Use Dispatchers.IO
+                    CoroutineScope(Dispatchers.Main).launch {
+                        repository.offlineOverride = false

@@ -93,3 +46,1 @@
-                        )
-                    }
-                }
+    if (periodicRefresh && repository.isNetworkAvailable()) {

@@ -279,3 +278,1 @@
-        if ((context != null && requireContext().isNetworkAvailable(null)) || context == null) {
-            binding.progressBar.visibility = View.VISIBLE
-            val parser = MercuryApi()
+        binding.progressBar.visibility = View.VISIBLE

@@ -43,1 +53,4 @@
             reloadBadges()
+
+            isConnectionAvailable.asStateFlow().collect { connectionAvailable ->
+                if (!connectionAvailable) {

@@ -1043,0 +1017,4 @@
+                    Toast.makeText(this, R.string.refresh_in_progress, Toast.LENGTH_SHORT).show()
+                    // TODO: Use Dispatchers.IO
+                    CoroutineScope(Dispatchers.Main).launch {
+                        repository.offlineOverride = false

@@ -134,3 +181,2 @@
     suspend fun markAsReadById(id: Int): Boolean {
-        // TODO: Check internet connection
-        return api.markAsRead(id.toString())?.isSuccess == true
+        var success = false

@@ -149,2 +199,2 @@
-        // TODO: Check internet connection
-        return api.unmarkAsRead(id.toString())?.isSuccess == true
+        var success = false
+        if (isNetworkAvailable()) {

@@ -163,2 +216,2 @@
-        // TODO: Check success, store in DB
-        return api.starr(id.toString())?.isSuccess == true
+        var success = false
+        if (isNetworkAvailable()) {

@@ -177,2 +233,2 @@
-        // TODO: Check internet connection
-        return api.unstarr(id.toString())?.isSuccess == true
+        var success = false
+        if (isNetworkAvailable()) {

@@ -184,1 +241,3 @@
-        val success = api.markAllAsRead(items.map { it.id.toString() })?.isSuccess == true
+    suspend fun markAllAsRead(items: ArrayList<SelfossModel.Item>): Boolean {
+        var success = false
+        if (isNetworkAvailable()) {

@@ -259,2 +323,2 @@
-        val response = api.update()
-        return response?.isSuccess ?: false
+        var response = false
+        if (isConnectionAvailable.value) {

@@ -299,1 +367,4 @@
 
+    fun isNetworkAvailable() = isConnectionAvailable.value && !offlineOverride
+
+    fun startNetwork() {

@@ -77,2 +80,4 @@
             )
         }
+
+        lifecycleScope.launch {

@@ -0,0 +16,4 @@
+        viewModelScope.launch {
+            repository.isConnectionAvailable.collect { isConnected ->
+                if (isConnected && !wasConnected && repository.connectionMonitored) {
+                    _toastMessageProvider.emit("Network connection is now available")

@@ -0,0 +1,65 @@
+plugins {