chore: changing actions in reader fragment.

.gitea/workflows/on_merge_on_release.yml

@@ -16,7 +16,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          ref: master
       - name: Config git
         run: |
           git config --global user.email aminecmi+giteadrone@pm.me
@@ -51,7 +50,7 @@ jobs:
           followtags: true
           ssh_key: ${{ secrets.PRIVATE_KEY }}
           tags: true
-          branch: master
+          branch: release
       - name: copy file via ssh password
         uses: appleboy/scp-action@v0.1.7
         with:
@@ -125,4 +124,4 @@ jobs:
           priority: high
           convert_markdown: true
           body: Nouveau fichier de mapping pour la version ${{ steps.version.outputs.VERSION }}
-          attachments: androidApp/build/outputs/mapping/githubConfigRelease/mapping.txt
+          attachments: androidApp/build/outputs/mapping/githubConfigRelease/mapping.txt

CHANGELOG.md

@@ -1,31 +1,3 @@
-**v125010241
-
-- Merge pull request 'fix: Link not opening.' (#178) from fix-open-link into master
-- refactor: context fragments issues.
-- logs: Context issues.
-- fix: Handle empty url issue, again.
-- fix: Link not opening.
-- Changelog for v125010201
-
---------------------------------------------------------------------
-
-**v125010201
-
-- fix: Handle empty url issue.
-- Merge pull request 'Removed the floating bar.' (#177) from floating-bar into master
-- chore: changing actions in reader fragment.
-- Changelog for v125010131
-
---------------------------------------------------------------------
-
-**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)

androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/HomeActivityTest.kt

@@ -56,7 +56,7 @@ class HomeActivityTest {
     fun testMenuActions() {
         onView(withId(R.id.action_search)).perform(click())
         onView(
-            withId(com.google.android.material.R.id.search_src_text),
+            withId(R.id.search_src_text),
         ).check(matches(isFocused()))
         onView(isRoot()).perform(ViewActions.pressBack())
 

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

@@ -31,7 +31,7 @@ import bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity
 import bou.amine.apps.readerforselfossv2.android.testing.CountingIdlingResourceSingleton
 import bou.amine.apps.readerforselfossv2.android.utils.bottombar.maybeShow
 import bou.amine.apps.readerforselfossv2.android.utils.bottombar.removeBadge
-import bou.amine.apps.readerforselfossv2.android.utils.openUrlInBrowserAsNewTask
+import bou.amine.apps.readerforselfossv2.android.utils.openUrlInBrowser
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
@@ -317,44 +317,50 @@ class HomeActivity :
 
     private fun reloadLayoutManager() {
         val currentManager = binding.recyclerView.layoutManager
+        val layoutManager: RecyclerView.LayoutManager
 
-        fun gridLayoutManager() {
+        // This will only update the layout manager if settings changed
-            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()) {
-                    gridLayoutManager()
+                    layoutManager =
+                        GridLayoutManager(
+                            this,
+                            calculateNoOfColumns(),
+                        )
+                    binding.recyclerView.layoutManager = layoutManager
                 }
 
             is GridLayoutManager ->
                 if (appSettingsService.isCardViewEnabled()) {
-                    staggererdGridLayoutManager()
+                    layoutManager =
+                        StaggeredGridLayoutManager(
+                            calculateNoOfColumns(),
+                            StaggeredGridLayoutManager.VERTICAL,
+                        )
+                    layoutManager.gapStrategy =
+                        StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS
+                    binding.recyclerView.layoutManager = layoutManager
                 }
 
             else ->
                 if (currentManager == null) {
                     if (!appSettingsService.isCardViewEnabled()) {
-                        gridLayoutManager()
+                        layoutManager =
+                            GridLayoutManager(
+                                this,
+                                calculateNoOfColumns(),
+                            )
+                        binding.recyclerView.layoutManager = layoutManager
                     } else {
-                        staggererdGridLayoutManager()
+                        layoutManager =
+                            StaggeredGridLayoutManager(
+                                calculateNoOfColumns(),
+                                StaggeredGridLayoutManager.VERTICAL,
+                            )
+                        layoutManager.gapStrategy =
+                            StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS
+                        binding.recyclerView.layoutManager = layoutManager
                     }
                 }
         }
@@ -479,8 +485,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 ->
@@ -493,13 +499,7 @@ class HomeActivity :
                 }
         }
 
-        @Suppress("detekt:ComplexCondition")
+        if (recyclerAdapter == null) {
-        if (recyclerAdapter == null ||
-            (
-                (recyclerAdapter is ItemListAdapter && appSettingsService.isCardViewEnabled()) ||
-                    (recyclerAdapter is ItemCardAdapter && !appSettingsService.isCardViewEnabled())
-            )
-        ) {
             if (appSettingsService.isCardViewEnabled()) {
                 recyclerAdapter =
                     ItemCardAdapter(
@@ -599,7 +599,7 @@ class HomeActivity :
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.issue_tracker -> {
-                baseContext.openUrlInBrowserAsNewTask(AppSettingsService.BUG_URL)
+                baseContext.openUrlInBrowser(AppSettingsService.BUG_URL)
                 return true
             }
 

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

@@ -33,9 +33,8 @@ import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapFitCenter
 import bou.amine.apps.readerforselfossv2.android.utils.glide.getBitmapInputStream
 import bou.amine.apps.readerforselfossv2.android.utils.glide.getGlideImageForResource
 import bou.amine.apps.readerforselfossv2.android.utils.isUrlValid
-import bou.amine.apps.readerforselfossv2.android.utils.maybeIfContext
 import bou.amine.apps.readerforselfossv2.android.utils.openItemUrlInBrowserAsNewTask
-import bou.amine.apps.readerforselfossv2.android.utils.openUrlInBrowserAsNewTask
+import bou.amine.apps.readerforselfossv2.android.utils.openUrlInBrowser
 import bou.amine.apps.readerforselfossv2.android.utils.shareLink
 import bou.amine.apps.readerforselfossv2.model.MercuryModel
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
@@ -118,8 +117,8 @@ class ArticleFragment :
                 e.sendSilentlyWithAcra()
             }
 
-            colorOnSurface = getColorFromAttr(com.google.android.material.R.attr.colorOnSurface)
+            colorOnSurface = requireContext().getColorFromAttr(R.attr.colorOnSurface)
-            colorSurface = getColorFromAttr(com.google.android.material.R.attr.colorSurface)
+            colorSurface = requireContext().getColorFromAttr(R.attr.colorSurface)
 
             contentText = item.content
             contentTitle = item.title.getHtmlDecoded()
@@ -148,11 +147,11 @@ class ArticleFragment :
             handleContent()
         } catch (e: InflateException) {
             e.sendSilentlyWithAcraWithName("webview not available")
-            maybeIfContext {
+            try {
                 AlertDialog
-                    .Builder(it)
+                    .Builder(requireContext())
-                    .setMessage(it.getString(R.string.webview_dialog_issue_message))
+                    .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
-                    .setTitle(it.getString(R.string.webview_dialog_issue_title))
+                    .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
                     .setPositiveButton(
                         android.R.string.ok,
                     ) { _, _ ->
@@ -160,6 +159,8 @@ class ArticleFragment :
                         requireActivity().finish()
                     }.create()
                     .show()
+            } catch (e: IllegalStateException) {
+                e.sendSilentlyWithAcraWithName("Context required is null")
             }
         }
 
@@ -181,7 +182,7 @@ class ArticleFragment :
 
             if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
                 binding.imageView.visibility = View.VISIBLE
-                maybeIfContext { it.bitmapFitCenter(contentImage, binding.imageView, appSettingsService) }
+                requireContext().bitmapFitCenter(contentImage, binding.imageView, appSettingsService)
             } else {
                 binding.imageView.visibility = View.GONE
             }
@@ -193,39 +194,39 @@ class ArticleFragment :
         fab.mainFabClosedIconColor = colorOnSurface
         fab.mainFabOpenedIconColor = colorOnSurface
 
-        maybeIfContext { handleFloatingToolbarActionItems(it) }
+        handleFloatingToolbarActionItems()
 
         fab.setOnActionSelectedListener { actionItem ->
             when (actionItem.id) {
                 R.id.share_action -> requireActivity().shareLink(url, contentTitle)
                 R.id.open_action -> requireActivity().openItemUrlInBrowserAsNewTask(this@ArticleFragment.item)
                 R.id.unread_action ->
-                    if (this@ArticleFragment.item.unread) {
+                    try {
-                        CoroutineScope(Dispatchers.IO).launch {
+                        if (this@ArticleFragment.item.unread) {
-                            repository.markAsRead(this@ArticleFragment.item)
+                            CoroutineScope(Dispatchers.IO).launch {
-                        }
+                                repository.markAsRead(this@ArticleFragment.item)
-                        this@ArticleFragment.item.unread = false
+                            }
-                        maybeIfContext {
+                            this@ArticleFragment.item.unread = false
                             Toast
                                 .makeText(
-                                    it,
+                                    requireContext(),
                                     R.string.marked_as_read,
                                     Toast.LENGTH_LONG,
                                 ).show()
-                        }
+                        } else {
-                    } else {
+                            CoroutineScope(Dispatchers.IO).launch {
-                        CoroutineScope(Dispatchers.IO).launch {
+                                repository.unmarkAsRead(this@ArticleFragment.item)
-                            repository.unmarkAsRead(this@ArticleFragment.item)
+                            }
-                        }
+                            this@ArticleFragment.item.unread = true
-                        this@ArticleFragment.item.unread = true
-                        maybeIfContext {
                             Toast
                                 .makeText(
-                                    it,
+                                    context,
                                     R.string.marked_as_unread,
                                     Toast.LENGTH_LONG,
                                 ).show()
                         }
+                    } catch (e: IllegalStateException) {
+                        e.sendSilentlyWithAcraWithName("Context required is null")
                     }
 
                 else -> Unit
@@ -234,14 +235,14 @@ class ArticleFragment :
         }
     }
 
-    private fun handleFloatingToolbarActionItems(c: Context) {
+    private fun handleFloatingToolbarActionItems() {
         fab.addHomeMadeActionItem(
             R.id.share_action,
             resources.getDrawable(R.drawable.ic_share_white_24dp),
             R.string.reader_action_share,
             colorOnSurface,
             colorSurface,
-            c,
+            requireContext(),
         )
         fab.addHomeMadeActionItem(
             R.id.open_action,
@@ -249,7 +250,7 @@ class ArticleFragment :
             R.string.reader_action_open,
             colorOnSurface,
             colorSurface,
-            c,
+            requireContext(),
         )
         fab.addHomeMadeActionItem(
             R.id.unread_action,
@@ -257,7 +258,7 @@ class ArticleFragment :
             R.string.unmark,
             colorOnSurface,
             colorSurface,
-            c,
+            requireContext(),
         )
     }
 
@@ -310,11 +311,9 @@ class ArticleFragment :
     }
 
     private fun handleLeadImage(leadImageUrl: String?) {
-        if (!leadImageUrl.isNullOrEmpty()) {
+        if (!leadImageUrl.isNullOrEmpty() && context != null) {
-            maybeIfContext {
+            binding.imageView.visibility = View.VISIBLE
-                binding.imageView.visibility = View.VISIBLE
+            requireContext().bitmapFitCenter(leadImageUrl, binding.imageView, appSettingsService)
-                it.bitmapFitCenter(leadImageUrl, binding.imageView, appSettingsService)
-            }
         } else {
             binding.imageView.visibility = View.GONE
         }
@@ -328,10 +327,11 @@ class ArticleFragment :
                     view: WebView?,
                     url: String,
                 ): Boolean =
-                    if (url.isUrlValid() &&
+                    if (context != null &&
+                        url.isUrlValid() &&
                         binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE
                     ) {
-                        maybeIfContext { it.openUrlInBrowserAsNewTask(url) }
+                        requireContext().openUrlInBrowser(url)
                         true
                     } else {
                         false
@@ -374,14 +374,23 @@ class ArticleFragment :
 
     @Suppress("detekt:LongMethod", "detekt:ImplicitDefaultLocale")
     private fun htmlToWebview() {
-        maybeIfContext {
+        val context: Context
+        try {
+            context = requireContext()
+        } catch (e: IllegalStateException) {
+            e.sendSilentlyWithAcraWithName("Context required is null")
+            return
+        }
+
+        try {
             val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
-            val a: TypedArray = it.obtainStyledAttributes(resId, attrs)
+            val a: TypedArray = context.obtainStyledAttributes(resId, attrs)
 
             binding.webcontent.settings.standardFontFamily = a.getString(0)
-            ""
+            binding.webcontent.visibility = View.VISIBLE
+        } catch (e: IllegalStateException) {
+            e.sendSilentlyWithAcraWithName("Context issue when setting attributes, but context wasn't null before")
         }
-        binding.webcontent.visibility = View.VISIBLE
 
         val colorSurfaceString =
             String.format(
@@ -395,12 +404,13 @@ class ArticleFragment :
                 WHITE_COLOR_HEX and (if (colorOnSurface != DATA_NULL_UNDEFINED) colorOnSurface else 0),
             )
 
-        binding.webcontent.settings.useWideViewPort = true
-        binding.webcontent.settings.loadWithOverviewMode = true
-        binding.webcontent.settings.javaScriptEnabled = false
-
-        handleImageLoading()
         try {
+            binding.webcontent.settings.useWideViewPort = true
+            binding.webcontent.settings.loadWithOverviewMode = true
+            binding.webcontent.settings.javaScriptEnabled = false
+
+            handleImageLoading()
+
             val gestureDetector =
                 GestureDetector(
                     activity,
@@ -414,50 +424,49 @@ class ArticleFragment :
                     event,
                 )
             }
+
+            binding.webcontent.settings.layoutAlgorithm =
+                WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
         } catch (e: IllegalStateException) {
-            e.sendSilentlyWithAcraWithName("Gesture detector issue ?")
+            e.sendSilentlyWithAcraWithName("Context is null but wasn't, and that's causing issues with webview config")
             return
         }
 
-        binding.webcontent.settings.layoutAlgorithm =
-            WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
-
-        var baseUrl: String? = null
         try {
-            val itemUrl = URL(url)
+            var baseUrl: String? = null
-            baseUrl = itemUrl.protocol + "://" + itemUrl.host
+            try {
-        } catch (e: MalformedURLException) {
+                val itemUrl = URL(url)
-            e.sendSilentlyWithAcraWithName("htmlToWebview > $url")
+                baseUrl = itemUrl.protocol + "://" + itemUrl.host
-        }
+            } catch (e: MalformedURLException) {
+                e.sendSilentlyWithAcraWithName("htmlToWebview > $url")
+            }
 
-        val fontName: String =
+            val fontName =
-            maybeIfContext {
                 when (font) {
-                    it.getString(R.string.open_sans_font_id) -> "Open Sans"
+                    getString(R.string.open_sans_font_id) -> "Open Sans"
-                    it.getString(R.string.roboto_font_id) -> "Roboto"
+                    getString(R.string.roboto_font_id) -> "Roboto"
-                    it.getString(R.string.source_code_pro_font_id) -> "Source Code Pro"
+                    getString(R.string.source_code_pro_font_id) -> "Source Code Pro"
                     else -> ""
                 }
-            }?.toString().orEmpty()
 
-        val fontLinkAndStyle =
+            val fontLinkAndStyle =
-            if (fontName.isNotEmpty()) {
+                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()
+                    """.trimMargin()
-            } else {
+                } else {
-                ""
+                    ""
-            }
+                }
-        try {
+
             binding.webcontent.loadDataWithBaseURL(
                 baseUrl,
                 """<html>
@@ -474,7 +483,7 @@ class ArticleFragment :
                 |        color: ${
                     String.format(
                         "#%06X",
-                        WHITE_COLOR_HEX and (maybeIfContext { it.resources.getColor(R.color.colorAccent) } as Int),
+                        WHITE_COLOR_HEX and context.resources.getColor(R.color.colorAccent),
                     )
                 } !important;
                 |      }
@@ -531,8 +540,10 @@ class ArticleFragment :
 
     private fun openInBrowserAfterFailing() {
         binding.progressBar.visibility = View.GONE
-        maybeIfContext {
+        try {
-            it.openItemUrlInBrowserAsNewTask(this@ArticleFragment.item)
+            requireContext().openItemUrlInBrowserAsNewTask(this@ArticleFragment.item)
+        } catch (e: IllegalStateException) {
+            e.sendSilentlyWithAcraWithName("Context required is null")
         }
     }
 

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

@@ -1,5 +1,6 @@
 package bou.amine.apps.readerforselfossv2.android.fragments
 
+import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
@@ -16,7 +17,6 @@ import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.FilterFragmentBinding
 import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.android.utils.glide.imageIntoViewTarget
-import bou.amine.apps.readerforselfossv2.android.utils.maybeIfContext
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.getColorHexCode
@@ -60,8 +60,8 @@ class FilterSheetFragment :
 
         try {
             CoroutineScope(Dispatchers.Main).launch {
-                handleTagChips()
+                handleTagChips(requireContext())
-                handleSourceChips()
+                handleSourceChips(requireContext())
 
                 binding.progressBar2.visibility = GONE
                 binding.filterView.visibility = VISIBLE
@@ -79,39 +79,29 @@ class FilterSheetFragment :
         return binding.root
     }
 
-    private suspend fun handleSourceChips() {
+    private suspend fun handleSourceChips(context: Context) {
         val sourceGroup = binding.sourcesGroup
 
         repository.getSourcesDetailsOrStats().forEachIndexed { _, source ->
-            val c: Chip? =
+            val c = Chip(context)
-                maybeIfContext {
-                    Chip(it)
-                } as Chip?
-
-            if (c == null) {
-                return
-            }
-
             c.ellipsize = TextUtils.TruncateAt.END
 
-            maybeIfContext {
+            context.imageIntoViewTarget(
-                it.imageIntoViewTarget(
+                source.getIcon(repository.baseUrl),
-                    source.getIcon(repository.baseUrl),
+                object : ViewTarget<Chip?, Drawable?>(c) {
-                    object : ViewTarget<Chip?, Drawable?>(c) {
+                    override fun onResourceReady(
-                        override fun onResourceReady(
+                        resource: Drawable,
-                            resource: Drawable,
+                        transition: Transition<in Drawable?>?,
-                            transition: Transition<in Drawable?>?,
+                    ) {
-                        ) {
+                        try {
-                            try {
+                            c.chipIcon = resource
-                                c.chipIcon = resource
+                        } catch (e: Exception) {
-                            } catch (e: Exception) {
+                            e.sendSilentlyWithAcraWithName("sources > onResourceReady")
-                                e.sendSilentlyWithAcraWithName("sources > onResourceReady")
-                            }
                         }
-                    },
+                    }
-                    appSettingsService,
+                },
-                )
+                appSettingsService,
-            }
+            )
 
             c.text = source.title.getHtmlDecoded()
 
@@ -147,17 +137,13 @@ class FilterSheetFragment :
         }
     }
 
-    private suspend fun handleTagChips() {
+    private suspend fun handleTagChips(context: Context) {
         val tagGroup = binding.tagsGroup
 
         val tags = repository.getTags()
 
         tags.forEachIndexed { _, tag ->
-            val c: Chip? = maybeIfContext { Chip(it) } as Chip?
+            val c = Chip(context)
-            if (c == null) {
-                return
-            }
-
             c.ellipsize = TextUtils.TruncateAt.END
             c.text = tag.tag
 

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

@@ -5,7 +5,6 @@ import android.content.Intent
 import android.util.TypedValue
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
-import androidx.fragment.app.Fragment
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.utils.toStringUriWithHttp
@@ -30,30 +29,15 @@ fun Context.shareLink(
 }
 
 @ColorInt
-fun Fragment.getColorFromAttr(
+fun Context.getColorFromAttr(
     @AttrRes attrColor: Int,
     resolveRefs: Boolean = true,
 ): Int {
     val typedValue = TypedValue()
-    maybeIfContextWithLog { this.requireContext().theme.resolveAttribute(attrColor, typedValue, resolveRefs) }
+    try {
+        this.theme.resolveAttribute(attrColor, typedValue, resolveRefs)
+    } catch (e: Throwable) {
+        e.sendSilentlyWithAcraWithName("ColorFromAttr")
+    }
     return typedValue.data
 }
-
-@Suppress("detekt:SwallowedException")
-fun Fragment.maybeIfContext(fn: (Context) -> Any): Any? {
-    try {
-        return fn(this.requireContext())
-    } catch (e: Exception) {
-        // Do nothing
-        return null
-    }
-}
-
-fun Fragment.maybeIfContextWithLog(fn: (Context) -> Any): Any? {
-    try {
-        return fn(this.requireContext())
-    } catch (e: Exception) {
-        e.sendSilentlyWithAcraWithName("Fragment context issue...")
-        return null
-    }
-}

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/glide/GlideUtils.kt

@@ -7,7 +7,6 @@ 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
@@ -23,12 +22,8 @@ import kotlin.io.encoding.ExperimentalEncodingApi
 
 private const val PRELOAD_IMAGE_TIMEOUT = 10000
 
-@Suppress("detekt:ReturnCount")
 @OptIn(ExperimentalEncodingApi::class)
-fun String.toGlideUrl(appSettingsService: AppSettingsService): Any { // GlideUrl Or String
+fun String.toGlideUrl(appSettingsService: AppSettingsService): GlideUrl {
-    if (this.isEmptyOrNullOrNullString()) {
-        return ""
-    }
     if (appSettingsService.getBasicUserName().isNotEmpty()) {
         val authString = "${appSettingsService.getBasicUserName()}:${appSettingsService.getBasicPassword()}"
         val authBuf = Base64.encode(authString.toByteArray(Charsets.UTF_8))

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
-    // trick: for the same plugin versions in all sub-modules
+    //trick: for the same plugin versions in all sub-modules
-    id("com.android.application").version("8.8.0").apply(false)
+    id("com.android.application").version("8.7.3").apply(false)
-    id("com.android.library").version("8.8.0").apply(false)
+    id("com.android.library").version("8.7.3").apply(false)
     id("org.jetbrains.kotlin.android").version("2.1.0").apply(false)
     kotlin("multiplatform").version("2.1.0").apply(false)
     id("com.mikepenz.aboutlibraries.plugin").version("10.5.1").apply(false)
@@ -16,6 +16,7 @@ allprojects {
     }
 }
 
+
 tasks.register("clean", Delete::class) {
     delete(layout.buildDirectory)
 }
@@ -23,4 +24,4 @@ tasks.register("clean", Delete::class) {
 dependencies {
     kover(project(":shared"))
     kover(project(":androidApp"))
-}
+}

fastlane/metadata/android/en-US/changelogs/v125010131.txt

@@ -1,5 +0,0 @@
-**v125010131**
-
-- fix: reload the adapter when it's needed. Fixes #128. (#176)
-- feat: basic auth and images loading. Fixes #172. (#175)
-- Changelog for v125010111

fastlane/metadata/android/en-US/changelogs/v125010201.txt

@@ -1,6 +0,0 @@
-**v125010201**
-
-- fix: Handle empty url issue.
-- Merge pull request 'Removed the floating bar.' (#177) from floating-bar into master
-- chore: changing actions in reader fragment.
-- Changelog for v125010131

fastlane/metadata/android/en-US/changelogs/v125010241.txt

@@ -1,8 +0,0 @@
-**v125010241**
-
-- Merge pull request 'fix: Link not opening.' (#178) from fix-open-link into master
-- refactor: context fragments issues.
-- logs: Context issues.
-- fix: Handle empty url issue, again.
-- fix: Link not opening.
-- Changelog for v125010201

gradle.properties

@@ -19,11 +19,11 @@ kotlin.code.style=official
 android.useAndroidX=true
 #android.nonTransitiveRClass=true
 android.enableJetifier=false
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=false
 #MPP
 kotlin.mpp.enableCInteropCommonization=true
 org.gradle.parallel=true
 org.gradle.caching=true
 ignoreGitVersion=false
 kotlin.native.cacheKind.iosX64=none
-org.gradle.configureondemand=true
+org.gradle.configureondemand=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Feb 09 14:44:52 CET 2025
+#Mon Nov 25 22:48:24 CET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists