fix: Unread and starred can be null.

CHANGELOG.md

@@ -1,12 +1,31 @@
-**v123020522**
+**v123030621**
 
-- Changelog for v123020521 [CI SKIP]
+- fix: url required issue.
+- fix: Canvas reused issue.
+- Changelog for v123020572 [CI SKIP]
 
 --------------------------------------------------------------------
 
-**v123020521**
+**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

@@ -28,7 +28,7 @@ fun gitVersion(): String {
     val maybeTagOfCurrentCommit = execWithOutput("git -C ../ describe --contains HEAD", true)
     process = if (maybeTagOfCurrentCommit.isEmpty()) {
         println("No tag on current commit. Will take the latest one.")
-        execWithOutput("git -C ../ for-each-ref refs/tags --sort=-authordate --format='%(refname:short)' --count=1")
+        execWithOutput("git -C ../ for-each-ref refs/tags --sort=-refname --format='%(refname:short)' --count=1")
     } else {
         println("Tag found on current commit")
         execWithOutput("git -C ../ describe --contains HEAD")
@@ -145,8 +145,8 @@ dependencies {
     implementation("com.amulyakhare:com.amulyakhare.textdrawable:1.0.1")
 
     // glide
-    kapt("com.github.bumptech.glide:compiler:4.14.2")
-    implementation("com.github.bumptech.glide:okhttp3-integration:4.14.2")
+    kapt("com.github.bumptech.glide:compiler:4.15.0")
+    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,6 +151,7 @@ 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))
@@ -162,6 +164,7 @@ class ArticleFragment : Fragment(), DIAware {
                     .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) {
+                    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")
@@ -325,7 +334,7 @@ class ArticleFragment : Fragment(), DIAware {
                             getBitmapInputStream(image, Bitmap.CompressFormat.JPEG)
                         )
                     } catch (e: ExecutionException) {
-                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > jpeg > $url")
+                        // Do nothing
                     }
                 } else if (url.lowercase(Locale.US).contains(".png")) {
                     try {
@@ -337,7 +346,7 @@ class ArticleFragment : Fragment(), DIAware {
                             getBitmapInputStream(image, Bitmap.CompressFormat.PNG)
                         )
                     } catch (e: ExecutionException) {
-                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > png > $url")
+                        // Do nothing
                     }
                 } else if (url.lowercase(Locale.US).contains(".webp")) {
                     try {
@@ -349,7 +358,7 @@ class ArticleFragment : Fragment(), DIAware {
                             getBitmapInputStream(image, Bitmap.CompressFormat.WEBP)
                         )
                     } catch (e: ExecutionException) {
-                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > webp > $url")
+                        // Do nothing
                     }
                 }
 
@@ -359,7 +368,7 @@ 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)
 
@@ -500,6 +509,7 @@ class ArticleFragment : Fragment(), DIAware {
                 null
             )
         }
+    }
 
     fun scrollDown() {
         val height = binding.nestedScrollView.measuredHeight

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.load.engine.GlideException
-import com.bumptech.glide.request.RequestListener
-import com.bumptech.glide.request.target.Target
+import com.bumptech.glide.request.target.ViewTarget
+import com.bumptech.glide.request.transition.Transition
 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?> {
-                    override fun onLoadFailed(
-                        e: GlideException?,
-                        model: Any?,
-                        target: Target<Drawable?>?,
-                        isFirstResource: Boolean
-                    ): Boolean {
-                        return false
-                    }
-
+                .into(object : ViewTarget<Chip?, Drawable?>(c) {
                     override fun onResourceReady(
-                        resource: Drawable?,
-                        model: Any?,
-                        target: Target<Drawable?>?,
-                        dataSource: DataSource?,
-                        isFirstResource: Boolean
-                    ): Boolean {
+                        resource: Drawable,
+                        transition: Transition<in Drawable?>?
+                    ) {
                         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

@@ -24,8 +24,8 @@ class SelfossModel {
     @Serializable
     class Stats(
         val total: Int,
-        val unread: Int,
-        val starred: Int
+        val unread: Int?,
+        val starred: Int?
     )
 
     @Serializable
@@ -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/repository/RepositoryImpl.kt

@@ -132,9 +132,9 @@ class Repository(
         if (isNetworkAvailable()) {
             val response = api.stats()
             if (response.success && response.data != null) {
-                _badgeUnread.value = response.data.unread
+                _badgeUnread.value = response.data.unread ?: 0
                 _badgeAll.value = response.data.total
-                _badgeStarred.value = response.data.starred
+                _badgeStarred.value = response.data.starred ?: 0
                 success = true
             }
         } else if (appSettingsService.isItemCachingEnabled()) {