fix: url required issue.

CHANGELOG.md

@@ -1,3 +1,20 @@
+**v123020572**
+
+- fix: requirecontext issues ?
+- debug: activity not found exception.
+- Changelog for v123020571 [CI SKIP]
+
+--------------------------------------------------------------------
+
+**v123020571**
+
+- chore: remove errors logging.
+- fix: quickfix for url param not provided for some sources.
+- Update 'CHANGELOG.md'
+- Changelog for v123020523 [CI SKIP]
+
+--------------------------------------------------------------------
+
 **v123020523**
 
 - fix: Git changelog.

androidApp/build.gradle.kts

@@ -145,8 +145,8 @@ dependencies {
     implementation("com.amulyakhare:com.amulyakhare.textdrawable:1.0.1")
 
     // glide
-    kapt("com.github.bumptech.glide:compiler:4.14.2")
+    kapt("com.github.bumptech.glide:compiler:4.15.0")
-    implementation("com.github.bumptech.glide:okhttp3-integration:4.14.2")
+    implementation("com.github.bumptech.glide:okhttp3-integration:4.15.0")
 
     // Themes
     implementation("com.github.rubensousa:floatingtoolbar:1.5.1")

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

@@ -1,5 +1,6 @@
 package bou.amine.apps.readerforselfossv2.android.fragments
 
+import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.content.res.TypedArray
@@ -150,17 +151,19 @@ class ArticleFragment : Fragment(), DIAware {
 
         } catch (e: InflateException) {
             e.sendSilentlyWithAcraWithName("webview not available")
-            AlertDialog.Builder(requireContext())
+            if (context != null) {
-                .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
+                AlertDialog.Builder(requireContext())
-                .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
+                    .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
-                .setPositiveButton(
+                    .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
-                    android.R.string.ok
+                    .setPositiveButton(
-                ) { _, _ ->
+                        android.R.string.ok
-                    appSettingsService.disableArticleViewer()
+                    ) { _, _ ->
-                    requireActivity().finish()
+                        appSettingsService.disableArticleViewer()
-                }
+                        requireActivity().finish()
-                .create()
+                    }
-                .show()
+                    .create()
+                    .show()
+            }
         }
 
         return binding.root
@@ -304,10 +307,16 @@ class ArticleFragment : Fragment(), DIAware {
         binding.webcontent.webViewClient = object : WebViewClient() {
             @Deprecated("Deprecated in Java")
             override fun shouldOverrideUrlLoading(view: WebView?, url: String): Boolean {
-                if (binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
+                return if (context != null && binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
-                    requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
+                    try {
+                        requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
+                    } catch (e: ActivityNotFoundException) {
+                        e.sendSilentlyWithAcraWithName("activityNotFound > $url")
+                    }
+                    true
+                } else {
+                    false
                 }
-                return true
             }
 
             @Deprecated("Deprecated in Java")
@@ -359,74 +368,74 @@ class ArticleFragment : Fragment(), DIAware {
     }
 
     private fun htmlToWebview() {
-
+        if (context != null) {
-        val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
+            val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
-        val a: TypedArray = requireContext().obtainStyledAttributes(resId, attrs)
+            val a: TypedArray = requireContext().obtainStyledAttributes(resId, attrs)
 
 
-        binding.webcontent.settings.standardFontFamily = a.getString(0)
+            binding.webcontent.settings.standardFontFamily = a.getString(0)
-        binding.webcontent.visibility = View.VISIBLE
+            binding.webcontent.visibility = View.VISIBLE
 
-        val colorOnSurface = TypedValue()
+            val colorOnSurface = TypedValue()
-        requireContext().theme.resolveAttribute(R.attr.colorOnSurface, colorOnSurface, true)
+            requireContext().theme.resolveAttribute(R.attr.colorOnSurface, colorOnSurface, true)
 
-        val colorSurface = TypedValue()
+            val colorSurface = TypedValue()
-        requireContext().theme.resolveAttribute(R.attr.colorSurface, colorSurface, true)
+            requireContext().theme.resolveAttribute(R.attr.colorSurface, colorSurface, true)
 
-        binding.webcontent.settings.useWideViewPort = true
+            binding.webcontent.settings.useWideViewPort = true
-        binding.webcontent.settings.loadWithOverviewMode = true
+            binding.webcontent.settings.loadWithOverviewMode = true
-        binding.webcontent.settings.javaScriptEnabled = false
+            binding.webcontent.settings.javaScriptEnabled = false
 
-        handleImageLoading()
+            handleImageLoading()
 
-        val gestureDetector =
+            val gestureDetector =
-            GestureDetector(activity, object : GestureDetector.SimpleOnGestureListener() {
+                GestureDetector(activity, object : GestureDetector.SimpleOnGestureListener() {
-                override fun onSingleTapUp(e: MotionEvent): Boolean {
+                    override fun onSingleTapUp(e: MotionEvent): Boolean {
-                    return performClick()
+                        return performClick()
-                }
+                    }
-            })
+                })
 
-        binding.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event) }
+            binding.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event) }
 
-        binding.webcontent.settings.layoutAlgorithm =
+            binding.webcontent.settings.layoutAlgorithm =
-            WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
+                WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
 
-        var baseUrl: String? = null
+            var baseUrl: String? = null
 
-        try {
+            try {
-            val itemUrl = URL(url)
+                val itemUrl = URL(url)
-            baseUrl = itemUrl.protocol + "://" + itemUrl.host
+                baseUrl = itemUrl.protocol + "://" + itemUrl.host
-        } catch (e: MalformedURLException) {
+            } catch (e: MalformedURLException) {
-            e.sendSilentlyWithAcraWithName("htmlToWebview > item url")
+                e.sendSilentlyWithAcraWithName("htmlToWebview > item url")
-        }
+            }
 
-        val fontName = when (font) {
+            val fontName = when (font) {
-            getString(R.string.open_sans_font_id) -> "Open Sans"
+                getString(R.string.open_sans_font_id) -> "Open Sans"
-            getString(R.string.roboto_font_id) -> "Roboto"
+                getString(R.string.roboto_font_id) -> "Roboto"
-            getString(R.string.source_code_pro_font_id) -> "Source Code Pro"
+                getString(R.string.source_code_pro_font_id) -> "Source Code Pro"
-            else -> ""
+                else -> ""
-        }
+            }
 
-        val fontLinkAndStyle = if (font.isNotEmpty()) {
+            val fontLinkAndStyle = if (font.isNotEmpty()) {
-            """<link href="https://fonts.googleapis.com/css?family=${
+                """<link href="https://fonts.googleapis.com/css?family=${
-                fontName.replace(
+                    fontName.replace(
-                    " ",
+                        " ",
-                    "+"
+                        "+"
-                )
+                    )
-            }" rel="stylesheet">
+                }" rel="stylesheet">
                 |<style>
                 |   * {
                 |       font-family: '$fontName';
                 |   }
                 |</style>
             """.trimMargin()
-        } else {
+            } else {
-            ""
+                ""
-        }
+            }
 
-        binding.webcontent.loadDataWithBaseURL(
+            binding.webcontent.loadDataWithBaseURL(
-            baseUrl,
+                baseUrl,
-            """<html>
+                """<html>
                 |<head>
                 |   <meta name="viewport" content="width=device-width, initial-scale=1">
                 |   <style>
@@ -438,11 +447,11 @@ class ArticleFragment : Fragment(), DIAware {
                 |      }
                 |      a {
                 |        color: ${
-                String.format(
+                    String.format(
-                    "#%06X",
+                        "#%06X",
-                    0xFFFFFF and resources.getColor(R.color.colorAccent)
+                        0xFFFFFF and resources.getColor(R.color.colorAccent)
-                )
+                    )
-            } !important;
+                } !important;
                 |      }
                 |      *:not(a) {
                 |        color: ${String.format("#%06X", 0xFFFFFF and colorOnSurface.data)};
@@ -454,25 +463,25 @@ class ArticleFragment : Fragment(), DIAware {
                 |        overflow:hidden;
                 |        line-height: 1.5em;
                 |        background-color: ${
-                String.format(
+                    String.format(
-                    "#%06X",
+                        "#%06X",
-                    0xFFFFFF and colorSurface.data
+                        0xFFFFFF and colorSurface.data
-                )
+                    )
-            };
+                };
                 |      }
                 |      body, html {
                 |        background-color: ${
-                String.format(
+                    String.format(
-                    "#%06X",
+                        "#%06X",
-                    0xFFFFFF and colorSurface.data
+                        0xFFFFFF and colorSurface.data
-                )
+                    )
-            } !important;
+                } !important;
                 |        border-color: ${
-                String.format(
+                    String.format(
-                    "#%06X",
+                        "#%06X",
-                    0xFFFFFF and colorSurface.data
+                        0xFFFFFF and colorSurface.data
-                )
+                    )
-            }  !important;
+                }  !important;
                 |        padding: 0 !important;
                 |        margin: 0 !important;
                 |      }
@@ -483,11 +492,11 @@ class ArticleFragment : Fragment(), DIAware {
                 |        white-space: pre-wrap;
                 |        width:100%;
                 |        background-color: ${
-                String.format(
+                    String.format(
-                    "#%06X",
+                        "#%06X",
-                    0xFFFFFF and colorSurface.data
+                        0xFFFFFF and colorSurface.data
-                )
+                    )
-            };
+                };
                 |      }
                 |   </style>
                 |   $fontLinkAndStyle
@@ -495,10 +504,11 @@ class ArticleFragment : Fragment(), DIAware {
                 |<body>
                 |   $contentText
                 |</body>""".trimMargin(),
-            "text/html",
+                "text/html",
-            "utf-8",
+                "utf-8",
-            null
+                null
-        )
+            )
+        }
     }
 
     fun scrollDown() {

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

@@ -20,10 +20,8 @@ import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.getIcon
 import com.bumptech.glide.Glide
-import com.bumptech.glide.load.DataSource
+import com.bumptech.glide.request.target.ViewTarget
-import com.bumptech.glide.load.engine.GlideException
+import com.bumptech.glide.request.transition.Transition
-import com.bumptech.glide.request.RequestListener
-import com.bumptech.glide.request.target.Target
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.chip.Chip
 import kotlinx.coroutines.CoroutineScope
@@ -90,31 +88,19 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
 
             Glide.with(context)
                 .load(source.getIcon(repository.baseUrl))
-                .listener(object : RequestListener<Drawable?> {
+                .into(object : ViewTarget<Chip?, Drawable?>(c) {
-                    override fun onLoadFailed(
-                        e: GlideException?,
-                        model: Any?,
-                        target: Target<Drawable?>?,
-                        isFirstResource: Boolean
-                    ): Boolean {
-                        return false
-                    }
-
                     override fun onResourceReady(
-                        resource: Drawable?,
+                        resource: Drawable,
-                        model: Any?,
+                        transition: Transition<in Drawable?>?
-                        target: Target<Drawable?>?,
+                    ) {
-                        dataSource: DataSource?,
-                        isFirstResource: Boolean
-                    ): Boolean {
                         try {
                             c.chipIcon = resource
                         } catch (e: Exception) {
                             e.sendSilentlyWithAcraWithName("sources > onResourceReady")
                         }
-                        return false
                     }
-                }).preload()
+
+                })
 
             c.text = source.title.getHtmlDecoded()
 

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/SelfossModel.kt

@@ -76,7 +76,7 @@ class SelfossModel {
     )
     @Serializable
     data class SourceParams(
-        val url: String?
+        val url: String? = null
     )
     @Serializable
     data class Item(

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/utils/EntityUtils.kt

@@ -20,7 +20,7 @@ fun SOURCE.toView(): SelfossModel.Source =
         this.spout,
         this.error,
         this.icon,
-        SelfossModel.SourceParams(this.url)
+        if (this.url != null) SelfossModel.SourceParams(this.url) else null
     )
 
 fun SelfossModel.Source.toEntity(): SOURCE =