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

@@ -44,6 +44,7 @@ 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
@@ -125,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>
 
@@ -707,6 +709,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) {
@@ -723,12 +726,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 {
@@ -958,11 +964,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) {
@@ -1033,13 +1041,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
@@ -1055,12 +1063,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) {
@@ -1086,6 +1098,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                             }
                         }
                     }
+                }
                 return true
             }
             R.id.action_disconnect -> {
@@ -1134,6 +1147,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             }
         }
 
+        if (this@HomeActivity.isNetworkAvailable(null, offlineShortcut)) {
             CoroutineScope(Dispatchers.Main).launch {
                 val actions = db.actionsDao().actions()
 
@@ -1148,4 +1162,5 @@ 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/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)
@@ -96,3 +98,4 @@ class SourcesListAdapter(
             }
         }
     }
+}

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

@@ -21,6 +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.repository.Repository
 import bou.amine.apps.readerforselfossv2.rest.SelfossModel
 import bou.amine.apps.readerforselfossv2.utils.ItemType
@@ -45,6 +46,8 @@ override fun doWork(): Result {
     val periodicRefresh = settings.getBoolean("periodic_refresh", false)
     if (periodicRefresh) {
 
+        if (context.isNetworkAvailable()) {
+
             CoroutineScope(Dispatchers.IO).launch {
                 val notificationManager =
                     applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
@@ -91,6 +94,7 @@ override fun doWork(): Result {
                     }
                 }
 
+                if (context.isNetworkAvailable()) {
                     launch {
                         try {
                             val newItems = repository.allItems(ItemType.UNREAD)
@@ -102,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,6 +276,7 @@ class ArticleFragment : Fragment(), DIAware {
     }
 
     private fun getContentFromMercury(customTabsIntent: CustomTabsIntent) {
+        if ((context != null && requireContext().isNetworkAvailable(null)) || context == null) {
             binding.progressBar.visibility = View.VISIBLE
             val parser = MercuryApi()
 
@@ -357,6 +359,7 @@ class ArticleFragment : Fragment(), DIAware {
                 }
             )
         }
+    }
 
     private fun htmlToWebview() {
         val stringColor = String.format("#%06X", 0xFFFFFF and appColors.colorAccent)

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

@@ -322,8 +322,7 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
 
     suspend fun updateRemote(): Boolean {
         var response = false
-        offlineOverride = false
-        if (isConnectionAvailable.value) {
+        if (isConnectionAvailable.value && !offlineOverride) {
             response = api.update()?.isSuccess == true
         }
         return response