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())
-                AlertDialog.Builder(requireContext())
+                .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
-                    .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
+                .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
-                    .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
+                .setPositiveButton(
-                    .setPositiveButton(
+                    android.R.string.ok
-                        android.R.string.ok
+                ) { _, _ ->
-                    ) { _, _ ->
+                    appSettingsService.disableArticleViewer()
-                        appSettingsService.disableArticleViewer()
+                    requireActivity().finish()
-                        requireActivity().finish()
+                }
-                    }
+                .create()
-                    .create()
+                .show()
-                    .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) {
+                if (binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
-                    try {
+                    requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
-                        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")
@@ -368,74 +359,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>
@@ -447,11 +438,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)};
@@ -463,25 +454,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;
                 |      }
@@ -492,11 +483,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
@@ -504,11 +495,10 @@ class ArticleFragment : Fragment(), DIAware {
                 |<body>
                 |   $contentText
                 |</body>""".trimMargin(),
-                "text/html",
+            "text/html",
-                "utf-8",
+            "utf-8",
-                null
+            null
-            )
+        )
-        }
     }
 
     fun scrollDown() {