Minor fixes and improvements. Dependency updates. Drop support for the old armeabi and use arm64-v8a instead

app/src/main/java/eu/kanade/tachiyomi/data/glide/FileFetcher.kt

@@ -0,0 +1,35 @@
+package eu.kanade.tachiyomi.data.glide
+
+import com.bumptech.glide.Priority
+import com.bumptech.glide.load.data.DataFetcher
+import java.io.File
+import java.io.IOException
+import java.io.InputStream
+
+open class FileFetcher(private val file: File) : DataFetcher<InputStream> {
+
+    private var data: InputStream? = null
+
+    override fun loadData(priority: Priority): InputStream {
+        data = file.inputStream()
+        return data!!
+    }
+
+    override fun cleanup() {
+        data?.let { data ->
+            try {
+                data.close()
+            } catch (e: IOException) {
+                // Ignore
+            }
+        }
+    }
+
+    override fun cancel() {
+        // Do nothing.
+    }
+
+    override fun getId(): String {
+        return file.toString()
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaFileFetcher.kt

@@ -1,29 +1,18 @@
 package eu.kanade.tachiyomi.data.glide
 
-import com.bumptech.glide.Priority
-import com.bumptech.glide.load.data.DataFetcher
 import eu.kanade.tachiyomi.data.database.models.Manga
 import java.io.File
-import java.io.InputStream
 
-class MangaFileFetcher(private val fetcher: DataFetcher<InputStream>,
-                       private val file: File,
-                       private val manga: Manga) : DataFetcher<InputStream> {
-
-
-    override fun loadData(priority: Priority?): InputStream? {
-        return fetcher.loadData(priority)
-    }
+open class MangaFileFetcher(private val file: File, private val manga: Manga) : FileFetcher(file) {
 
+    /**
+     * Returns the id for this manga's cover.
+     *
+     * Appending the file's modified date to the url, we can force Glide to skip its memory and disk
+     * lookup step and fetch from our custom cache. This allows us to invalidate Glide's cache when
+     * the file has changed. If the file doesn't exist it will append a 0.
+     */
     override fun getId(): String {
         return manga.thumbnail_url + file.lastModified()
     }
-
-    override fun cancel() {
-        fetcher.cancel()
-    }
-
-    override fun cleanup() {
-        fetcher.cleanup()
-    }
 }

app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaModelLoader.kt

@@ -44,12 +44,6 @@ class MangaModelLoader(context: Context) : StreamModelLoader<Manga> {
     private val baseUrlLoader = Glide.buildModelLoader(GlideUrl::class.java,
             InputStream::class.java, context)
 
-    /**
-     * Base file loader.
-     */
-    private val baseFileLoader = Glide.buildModelLoader(File::class.java,
-            InputStream::class.java, context)
-
     /**
      * LRU cache whose key is the thumbnail url of the manga, and the value contains the request url
      * and the file where it should be stored in case the manga is a favorite.
@@ -109,11 +103,8 @@ class MangaModelLoader(context: Context) : StreamModelLoader<Manga> {
             // Get the file from the url, removing the scheme if present.
             val file = File(url.substringAfter("file://"))
 
-            // Get the resource fetcher for the given file.
-            val fileFetcher = baseFileLoader.getResourceFetcher(file, width, height)
-
             // Return an instance of the fetcher providing the needed elements.
-            return MangaFileFetcher(fileFetcher, file, manga)
+            return MangaFileFetcher(file, manga)
         }
     }
 

app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaUrlFetcher.kt

@@ -21,10 +21,9 @@ import java.io.InputStream
 class MangaUrlFetcher(private val networkFetcher: DataFetcher<InputStream>,
                       private val file: File,
                       private val manga: Manga)
-: DataFetcher<InputStream> {
+: MangaFileFetcher(file, manga) {
 
-    @Throws(Exception::class)
-    override fun loadData(priority: Priority): InputStream? {
+    override fun loadData(priority: Priority): InputStream {
         if (manga.favorite) {
             synchronized(file) {
                 if (!file.exists()) {
@@ -51,7 +50,7 @@ class MangaUrlFetcher(private val networkFetcher: DataFetcher<InputStream>,
                     }
                 }
             }
-            return file.inputStream()
+            return super.loadData(priority)
         } else {
             if (file.exists()) {
                 file.delete()
@@ -60,22 +59,12 @@ class MangaUrlFetcher(private val networkFetcher: DataFetcher<InputStream>,
         }
     }
 
-    /**
-     * Returns the id for this manga's cover.
-     *
-     * Appending the file's modified date to the url, we can force Glide to skip its memory and disk
-     * lookup step and fetch from our custom cache. This allows us to invalidate Glide's cache when
-     * the file has changed. If the file doesn't exist it will append a 0.
-     */
-    override fun getId(): String {
-        return manga.thumbnail_url + file.lastModified()
-    }
-
     override fun cancel() {
         networkFetcher.cancel()
     }
 
     override fun cleanup() {
+        super.cleanup()
         networkFetcher.cleanup()
     }