Prevent Glide from opening svg images

Update to support rebase
2021-01-09 23:43:31 +01:00 · 2021-01-09 23:41:57 +01:00
2 changed files with 2 additions and 10 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -36,12 +36,6 @@
 - Closing #178. Expending images on tap.
 - Closing #323. Old issue with textview not having the right color.
 - Closing #324. Svg images loading crashes the app.
 - Closing #322. App crashed because of svg images.
 **1.6.x**
 - Handling hidden tags.
@ -62,8 +56,6 @@
 - Fixes #215, #208.
 - Fixes #328.
 **1.5.7.x**
 - Added confirmation to the mark as read and update menues.
--- 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
@ -156,7 +156,7 @@ data class Item(
    fun preloadImages(context: Context) : Boolean {
        val imageUrls = this.getImages()
-        val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL).timeout(10000)
+        val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
        try {
@ -164,7 +164,7 @@ data class Item(
                if ( URLUtil.isValidUrl(url)) {
                    val image = Glide.with(context).asBitmap()
                            .apply(glideOptions)
-                            .load(url).submit()
+                            .load(url).submit().get()
                }
            }
        } catch (e : Error) {
Author	SHA1	Message	Date
davidoskky	9e0fdf30ec	Prevent Glide from opening svg images	2021-01-09 23:43:31 +01:00
davidoskky	0d84a2d7e9	Update to support rebase	2021-01-09 23:41:57 +01:00