fix: Handle empty url issue.

Merge pull request 'Removed the floating bar.' (#177 ) from floating-bar into master
Reviewed-on: #177
2025-01-19 14:49:37 +01:00 · 2025-01-19 13:35:18 +00:00 · 2025-01-19 12:54:25 +00:00 · 2025-01-13 16:19:05 +00:00 · 2025-01-13 15:08:39 +00:00
4 changed files with 49 additions and 32 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,11 @@
+**v125010131
+
+- fix: reload the adapter when it's needed. Fixes #128. (#176)
+- feat: basic auth and images loading. Fixes #172. (#175)
+- Changelog for v125010111
+
+--------------------------------------------------------------------
+
 **v125010111

 - Debug trying to fix context issues. (#174)
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt
@ -317,50 +317,44 @@ class HomeActivity :

    private fun reloadLayoutManager() {
        val currentManager = binding.recyclerView.layoutManager
-        val layoutManager: RecyclerView.LayoutManager

-        // This will only update the layout manager if settings changed
+        fun gridLayoutManager() {
+            val layoutManager =
+                GridLayoutManager(
+                    this,
+                    calculateNoOfColumns(),
+                )
+            binding.recyclerView.layoutManager = layoutManager
+        }
+
+        fun staggererdGridLayoutManager() {
+            var layoutManager =
+                StaggeredGridLayoutManager(
+                    calculateNoOfColumns(),
+                    StaggeredGridLayoutManager.VERTICAL,
+                )
+            layoutManager.gapStrategy =
+                StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS
+            binding.recyclerView.layoutManager = layoutManager
+        }
+
        when (currentManager) {
            is StaggeredGridLayoutManager ->
                if (!appSettingsService.isCardViewEnabled()) {
-                    layoutManager =
-                        GridLayoutManager(
-                            this,
-                            calculateNoOfColumns(),
-                        )
-                    binding.recyclerView.layoutManager = layoutManager
+                    gridLayoutManager()
                }

            is GridLayoutManager ->
                if (appSettingsService.isCardViewEnabled()) {
-                    layoutManager =
-                        StaggeredGridLayoutManager(
-                            calculateNoOfColumns(),
-                            StaggeredGridLayoutManager.VERTICAL,
-                        )
-                    layoutManager.gapStrategy =
-                        StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS
-                    binding.recyclerView.layoutManager = layoutManager
+                    staggererdGridLayoutManager()
                }

            else ->
                if (currentManager == null) {
                    if (!appSettingsService.isCardViewEnabled()) {
-                        layoutManager =
-                            GridLayoutManager(
-                                this,
-                                calculateNoOfColumns(),
-                            )
-                        binding.recyclerView.layoutManager = layoutManager
+                        gridLayoutManager()
                    } else {
-                        layoutManager =
-                            StaggeredGridLayoutManager(
-                                calculateNoOfColumns(),
-                                StaggeredGridLayoutManager.VERTICAL,
-                            )
-                        layoutManager.gapStrategy =
-                            StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS
-                        binding.recyclerView.layoutManager = layoutManager
+                        staggererdGridLayoutManager()
                    }
                }
        }
@ -485,8 +479,8 @@ class HomeActivity :
    }

    private fun handleListResult(appendResults: Boolean = false) {
+        val oldManager = binding.recyclerView.layoutManager
        if (appendResults) {
-            val oldManager = binding.recyclerView.layoutManager
            firstVisible =
                when (oldManager) {
                    is StaggeredGridLayoutManager ->
@ -499,7 +493,13 @@ class HomeActivity :
                }
        }

-        if (recyclerAdapter == null) {
+        @Suppress("detekt:ComplexCondition")
+        if (recyclerAdapter == null ||
+            (
+                (recyclerAdapter is ItemListAdapter && appSettingsService.isCardViewEnabled()) ||
+                    (recyclerAdapter is ItemCardAdapter && !appSettingsService.isCardViewEnabled())
+            )
+        ) {
            if (appSettingsService.isCardViewEnabled()) {
                recyclerAdapter =
                    ItemCardAdapter(
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/glide/GlideUtils.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/glide/GlideUtils.kt
@ -7,6 +7,7 @@ import android.webkit.WebView
 import android.widget.ImageView
 import bou.amine.apps.readerforselfossv2.android.utils.CircleImageView
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
+import bou.amine.apps.readerforselfossv2.utils.isEmptyOrNullOrNullString
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.load.model.GlideUrl
@ -24,6 +25,9 @@ private const val PRELOAD_IMAGE_TIMEOUT = 10000

@OptIn(ExperimentalEncodingApi::class)
 fun String.toGlideUrl(appSettingsService: AppSettingsService): GlideUrl {
+    if (this.isEmptyOrNullOrNullString()) {
+        return GlideUrl("")
+    }
    if (appSettingsService.getBasicUserName().isNotEmpty()) {
        val authString = "${appSettingsService.getBasicUserName()}:${appSettingsService.getBasicPassword()}"
        val authBuf = Base64.encode(authString.toByteArray(Charsets.UTF_8))
--- a/fastlane/metadata/android/en-US/changelogs/v125010131.txt
+++ b/fastlane/metadata/android/en-US/changelogs/v125010131.txt
@ -0,0 +1,5 @@
+**v125010131**
+
+- fix: reload the adapter when it's needed. Fixes #128. (#176)
+- feat: basic auth and images loading. Fixes #172. (#175)
+- Changelog for v125010111
Author	SHA1	Message	Date
Amine	1893904135	fix: Handle empty url issue. All checks were successful Check master code / build (push) Successful in 10m53s Details Create tag / build (push) Successful in 7m40s Details Create tag / createTagAndChangelog (push) Successful in 38s Details Create tag / release (push) Successful in 5m3s Details	2025-01-19 14:49:37 +01:00
Amine Bouabdallaoui	a4cb28ba81	Merge pull request 'Removed the floating bar.' (#177 ) from floating-bar into master All checks were successful Check master code / build (push) Successful in 11m40s Details Reviewed-on: #177	2025-01-19 13:35:18 +00:00
Amine	ae3cada1c7	chore: changing actions in reader fragment. All checks were successful Check PR code / Lint (pull_request) Successful in 3m21s Details Check PR code / build (pull_request) Successful in 11m38s Details	2025-01-19 12:54:25 +00:00
giteadrone	309500276f	Changelog for v125010131 All checks were successful Check master code / build (push) Successful in 8m58s Details	2025-01-13 16:19:05 +00:00
Amine	ce255b23cd	fix: reload the adapter when it's needed. Fixes #128 . (#176 ) All checks were successful Check master code / build (push) Successful in 10m27s Details Create tag / build (push) Successful in 7m41s Details Create tag / createTagAndChangelog (push) Successful in 48s Details Create tag / release (push) Successful in 5m28s Details ## Types of changes - [ ] I have read the CONTRIBUTING document. - [ ] My code follows the code style of this project. - [ ] I have updated the documentation accordingly. - [ ] I have added tests to cover my changes. - [ ] All new and existing tests passed. - [ ] This is NOT translation related. This closes issue #XXX This is implements feature #YYY This finishes chore #ZZZ Reviewed-on: #176 Co-authored-by: Amine <amine.bouabdallaoui@pm.me> Co-committed-by: Amine <amine.bouabdallaoui@pm.me>	2025-01-13 15:08:39 +00:00