Merge pull request 'fix-reload' (#195) from fix-reload into master

Reviewed-on: #195

.gitea/workflows/on_pr_test.yml

@@ -30,10 +30,7 @@ jobs:
         run: mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true" >> ~/.gradle/gradle.properties
       - name: Change url until I find a better way to do it
         run: |
-          sed -i "s/const DEFAULT_URL = \"http:\/\/10\.0\.2\.2\:8888\"/const DEFAULT_URL = \"http:\/\/172\.17\.0\.1\:8888\"/g" ./androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/CommonTests.kt
-          echo '-----------'
-          cat ./androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/CommonTests.kt
-          echo '-----------'
+          sed -i "s/const val DEFAULT_URL = \"http:\/\/10\.0\.2\.2\:8888\"/const val DEFAULT_URL = \"http:\/\/172\.17\.0\.1\:8888\"/g" ./androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/CommonTests.kt
       - name: Tests
         uses: reactivecircus/android-emulator-runner@v2
         with:

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

@@ -120,6 +120,7 @@ class HomeActivity :
         binding.swipeRefreshLayout.setOnRefreshListener {
             repository.offlineOverride = false
             lastFetchDone = false
+            items.clear()
             getElementsAccordingToTab()
             binding.swipeRefreshLayout.isRefreshing = false
         }
@@ -458,23 +459,28 @@ class HomeActivity :
         appendResults: Boolean,
         itemType: ItemType,
     ) {
-        CountingIdlingResourceSingleton.increment()
-        binding.swipeRefreshLayout.isRefreshing = true
-        CoroutineScope(Dispatchers.IO).launch {
-            repository.displayedItems = itemType
-            items =
-                if (appendResults) {
-                    repository.getOlderItems()
-                } else {
-                    repository.getNewerItems()
-                }
+        @Suppress("detekt:ComplexCondition")
+        if ((appendResults && items.size > 0) || (!appendResults && items.size == 0)) {
             CountingIdlingResourceSingleton.increment()
-            launch(Dispatchers.Main) {
-                binding.swipeRefreshLayout.isRefreshing = false
-                handleListResult()
+            binding.swipeRefreshLayout.isRefreshing = true
+            CoroutineScope(Dispatchers.IO).launch {
+                repository.displayedItems = itemType
+                items =
+                    if (appendResults) {
+                        repository.getOlderItems()
+                    } else {
+                        repository.getNewerItems()
+                    }
+                CountingIdlingResourceSingleton.increment()
+                launch(Dispatchers.Main) {
+                    binding.swipeRefreshLayout.isRefreshing = false
+                    handleListResult()
+                    CountingIdlingResourceSingleton.decrement()
+                }
                 CountingIdlingResourceSingleton.decrement()
             }
-            CountingIdlingResourceSingleton.decrement()
+        } else {
+            handleListResult()
         }
     }
 
@@ -534,7 +540,10 @@ class HomeActivity :
     }
 
     private fun reloadBadges() {
-        if (appSettingsService.isDisplayUnreadCountEnabled() || appSettingsService.isDisplayAllCountEnabled()) {
+        if (appSettingsService.isInfiniteLoadingEnabled() ||
+            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 val items: ArrayList<SelfossModel.Item>,
+    override var 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 val items: ArrayList<SelfossModel.Item>,
+    override var 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 val items: ArrayList<SelfossModel.Item>
+    abstract var items: ArrayList<SelfossModel.Item>
     abstract val repository: Repository
     abstract val binding: ViewBinding
     abstract val appSettingsService: AppSettingsService
@@ -31,8 +31,7 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> :
     protected val c: Context get() = app.baseContext
 
     fun updateAllItems(items: ArrayList<SelfossModel.Item>) {
-        this.items.clear()
-        this.items.addAll(items)
+        this.items = items
         updateHomeItems(items)
         notifyDataSetChanged()
     }