From d1d956b77a27a02a0e6655a23928ed923e6db084 Mon Sep 17 00:00:00 2001
From: davidoskky <davidoskky@yahoo.it>
Date: Sun, 10 Jan 2021 05:08:40 +0100
Subject: [PATCH] Improve image caching (#327)

* Update to support rebase

* Prevent Glide from opening svg images
---
 .../apps/amine/bou/readerforselfoss/ImageActivity.kt     | 2 +-
 .../bou/readerforselfoss/api/selfoss/SelfossModels.kt    | 9 ++++++++-
 .../bou/readerforselfoss/fragments/ImageFragment.kt      | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/ImageActivity.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/ImageActivity.kt
index db82a88..b0426fa 100644
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/ImageActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/ImageActivity.kt
@@ -21,7 +21,7 @@ class ImageActivity : AppCompatActivity() {
         supportActionBar?.setDisplayShowTitleEnabled(false)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
-        allImages = intent.getStringArrayListExtra("allImages")
+        allImages = intent.getStringArrayListExtra("allImages") as ArrayList<String>
         position = intent.getIntExtra("position", 0)
 
         pager.adapter = ScreenSlidePagerAdapter(supportFragmentManager)
diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossModels.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossModels.kt
index 05ef1c4..7a5a924 100644
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossModels.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossModels.kt
@@ -141,7 +141,14 @@ data class Item(
         var allImages = ArrayList<String>()
 
         for ( image in Jsoup.parse(content).getElementsByTag("img")) {
-            allImages.add(image.attr("src"))
+            val url = image.attr("src")
+            if (url.toLowerCase().contains(".jpg") ||
+                    url.toLowerCase().contains(".jpeg") ||
+                    url.toLowerCase().contains(".png") ||
+                    url.toLowerCase().contains(".webp"))
+            {
+                allImages.add(url)
+            }
         }
         return allImages
     }
diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ImageFragment.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ImageFragment.kt
index 30c0cd8..e8ea0c5 100644
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ImageFragment.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ImageFragment.kt
@@ -17,7 +17,7 @@ class ImageFragment : Fragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        imageUrl = arguments!!.getString("imageUrl")!!
+        imageUrl = requireArguments().getString("imageUrl")!!
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {