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

@@ -120,7 +120,6 @@ class HomeActivity :
         binding.swipeRefreshLayout.setOnRefreshListener {
             repository.offlineOverride = false
             lastFetchDone = false
-            items.clear()
             getElementsAccordingToTab()
             binding.swipeRefreshLayout.isRefreshing = false
         }
@@ -459,28 +458,23 @@ class HomeActivity :
         appendResults: Boolean,
         itemType: ItemType,
     ) {
-        @Suppress("detekt:ComplexCondition")
+        CountingIdlingResourceSingleton.increment()
-        if ((appendResults && items.size > 0) || (!appendResults && items.size == 0)) {
+        binding.swipeRefreshLayout.isRefreshing = true
-            CountingIdlingResourceSingleton.increment()
+        CoroutineScope(Dispatchers.IO).launch {
-            binding.swipeRefreshLayout.isRefreshing = true
+            repository.displayedItems = itemType
-            CoroutineScope(Dispatchers.IO).launch {
+            items =
-                repository.displayedItems = itemType
+                if (appendResults) {
-                items =
+                    repository.getOlderItems()
-                    if (appendResults) {
+                } else {
-                        repository.getOlderItems()
+                    repository.getNewerItems()
-                    } else {
-                        repository.getNewerItems()
-                    }
-                CountingIdlingResourceSingleton.increment()
-                launch(Dispatchers.Main) {
-                    binding.swipeRefreshLayout.isRefreshing = false
-                    handleListResult()
-                    CountingIdlingResourceSingleton.decrement()
                 }
+            CountingIdlingResourceSingleton.increment()
+            launch(Dispatchers.Main) {
+                binding.swipeRefreshLayout.isRefreshing = false
+                handleListResult()
                 CountingIdlingResourceSingleton.decrement()
             }
-        } else {
+            CountingIdlingResourceSingleton.decrement()
-            handleListResult()
         }
     }
 
@@ -540,10 +534,7 @@ class HomeActivity :
     }
 
     private fun reloadBadges() {
-        if (appSettingsService.isInfiniteLoadingEnabled() ||
+        if (appSettingsService.isDisplayUnreadCountEnabled() || appSettingsService.isDisplayAllCountEnabled()) {
-            appSettingsService.isDisplayUnreadCountEnabled() ||
-            appSettingsService.isDisplayAllCountEnabled()
-        ) {
             CountingIdlingResourceSingleton.increment()
             CoroutineScope(Dispatchers.IO).launch {
                 repository.reloadBadges()

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

@@ -30,7 +30,7 @@ import org.kodein.di.instance
 
 class ItemCardAdapter(
     override val app: Activity,
-    override var items: ArrayList<SelfossModel.Item>,
+    override val items: ArrayList<SelfossModel.Item>,
     override val updateHomeItems: (ArrayList<SelfossModel.Item>) -> Unit,
 ) : ItemsAdapter<ItemCardAdapter.ViewHolder>() {
     override lateinit var binding: CardItemBinding

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

@@ -21,7 +21,7 @@ import org.kodein.di.instance
 
 class ItemListAdapter(
     override val app: Activity,
-    override var items: ArrayList<SelfossModel.Item>,
+    override val items: ArrayList<SelfossModel.Item>,
     override val updateHomeItems: (ArrayList<SelfossModel.Item>) -> Unit,
 ) : ItemsAdapter<ItemListAdapter.ViewHolder>() {
     override lateinit var binding: ListItemBinding

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

@@ -21,7 +21,7 @@ import org.kodein.di.DIAware
 abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> :
     RecyclerView.Adapter<VH>(),
     DIAware {
-    abstract var items: ArrayList<SelfossModel.Item>
+    abstract val items: ArrayList<SelfossModel.Item>
     abstract val repository: Repository
     abstract val binding: ViewBinding
     abstract val appSettingsService: AppSettingsService
@@ -31,7 +31,8 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> :
     protected val c: Context get() = app.baseContext
 
     fun updateAllItems(items: ArrayList<SelfossModel.Item>) {
-        this.items = items
+        this.items.clear()
+        this.items.addAll(items)
         updateHomeItems(items)
         notifyDataSetChanged()
     }