Fix some typo in readme

CHANGELOG.md

@@ -1,20 +1,3 @@
-**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.

README.md

@@ -2,11 +2,11 @@
 
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/readerforselfoss/localized.svg)](https://crowdin.com/project/readerforselfoss)
 
-It's an RSS Reader for Android and IOS, that **only** works with [Selfoss](https://selfoss.aditu.de/)
+**ReaderForSelfoss** is a RSS Reader for Android and IOS, that **only** works with [Selfoss](https://selfoss.aditu.de/)
 
 If you are a developer, don't hesitate to help with PRs.
 
-If you are a user, you can still create new issues. I'll fix them when I can.
+If you are a user, fell free to create issues. I'll fix them when I can.
 
 <a href="https://f-droid.org/packages/bou.amine.apps.readerforselfossv2.android"><img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="100"></a>
 
@@ -14,13 +14,13 @@ If you are a user, you can still create new issues. I'll fix them when I can.
 
 <img src="res//fr-card.png?raw=true" alt="card view" width="400"/> <img src="res//fr-list.png?raw=true" alt="list view" width="400"/>
 
-## Like my app ?
+## Like my app?
 
 <a href="https://www.buymeacoffee.com/aminecmi" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/lato-orange.png" alt="Buy Me A Coffee" style="height: 51px !important;width: 217px !important;" ></a>
 
-## Want to help ?
+## Want to help?
 
-1. **You'll have to have a Selfoss instance running.** You'll find everything you need to install it [here](https://selfoss.aditu.de/).
+1. **You need a Selfoss instance running.** Find everything you need to install it [here](https://selfoss.aditu.de/).
 
 2. Check the [Contribution guide](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md).
 
@@ -30,8 +30,8 @@ If you are a user, you can still create new issues. I'll fix them when I can.
 
 - [Check what changed](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/CHANGELOG.md)
 - [See what I'm doing](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/projects/1)
-- [Create an issue, or request a new feature](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/issues)
-- [Help translation the app](https://crowdin.com/project/readerforselfoss)
+- [Create an issue or request a new feature](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/issues)
+- [Help translating the app](https://crowdin.com/project/readerforselfoss)
 
 ## Contributors (V1) (Alphabetical order) ❤️
 

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.15.0")
-    implementation("com.github.bumptech.glide:okhttp3-integration:4.15.0")
+    kapt("com.github.bumptech.glide:compiler:4.14.2")
+    implementation("com.github.bumptech.glide:okhttp3-integration:4.14.2")
 
     // Themes
     implementation("com.github.rubensousa:floatingtoolbar:1.5.1")

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

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

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

@@ -20,8 +20,10 @@ 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.request.target.ViewTarget
-import com.bumptech.glide.request.transition.Transition
+import com.bumptech.glide.load.DataSource
+import com.bumptech.glide.load.engine.GlideException
+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
@@ -88,19 +90,31 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
 
             Glide.with(context)
                 .load(source.getIcon(repository.baseUrl))
-                .into(object : ViewTarget<Chip?, Drawable?>(c) {
+                .listener(object : RequestListener<Drawable?> {
+                    override fun onLoadFailed(
+                        e: GlideException?,
+                        model: Any?,
+                        target: Target<Drawable?>?,
+                        isFirstResource: Boolean
+                    ): Boolean {
+                        return false
+                    }
+
                     override fun onResourceReady(
-                        resource: Drawable,
-                        transition: Transition<in Drawable?>?
-                    ) {
+                        resource: Drawable?,
+                        model: Any?,
+                        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? = null
+        val url: String
     )
     @Serializable
     data class Item(