feat: SVGの場合でもキャッシュできるようにした

modules/common/src/main/java/net/pantasystem/milktea/common/glide/svg/SvgDecoder.kt

@@ -15,18 +15,22 @@ private const val SVG_HEADER: Int = 0x3C737667
 private const val SVG_HEADER_STARTS_WITH_XML = 0x3c3f786d
 class SvgDecoder : ResourceDecoder<InputStream, SVG>{
 
+    companion object {
+        fun isSvg(source: InputStream): Boolean {
+            val buffer = ByteArray(8)
+            val cnt = source.read(buffer)
+            if (cnt < 8) {
+                Log.d("SvgDecoder", "svgではない")
+                return false
+            }
 
-    override fun handles(source: InputStream, options: Options): Boolean {
-        val buffer = ByteArray(8)
-        val cnt = source.read(buffer)
-        if (cnt < 8) {
-            Log.d("SvgDecoder", "svgではない")
-            return false
+            val header = ByteBuffer.wrap(buffer).int
+            return header == SVG_HEADER || header == SVG_HEADER_STARTS_WITH_XML
         }
+    }
 
-        Log.d("SvgDecoder", "svgだった")
-        val header = ByteBuffer.wrap(buffer).int
-        return header == SVG_HEADER || header == SVG_HEADER_STARTS_WITH_XML
+    override fun handles(source: InputStream, options: Options): Boolean {
+        return isSvg(source)
     }
 
     override fun decode(

modules/data/build.gradle

@@ -117,6 +117,8 @@ dependencies {
 
     testImplementation libs.robolectric
 
+    implementation 'com.caverock:androidsvg-aar:1.4'
+
 }
 
 kapt {

modules/data/src/main/java/net/pantasystem/milktea/data/infrastructure/image/ImageCacheRepositoryImpl.kt

@@ -2,12 +2,16 @@ package net.pantasystem.milktea.data.infrastructure.image
 
 import android.content.Context
 import android.graphics.BitmapFactory
+import android.util.Log
+import com.caverock.androidsvg.SVG
+import com.caverock.androidsvg.SVGParseException
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import kotlinx.datetime.Clock
 import net.pantasystem.milktea.api.misskey.OkHttpClientProvider
 import net.pantasystem.milktea.common.Hash
+import net.pantasystem.milktea.common.glide.svg.SvgDecoder
 import net.pantasystem.milktea.common.runCancellableCatching
 import net.pantasystem.milktea.common_android.hilt.IODispatcher
 import net.pantasystem.milktea.model.image.ImageCache
@@ -121,12 +125,28 @@ class ImageCacheRepositoryImpl @Inject constructor(
                         throw Exception("Download failed: url=$url")
                     }
                 }
-            val options = BitmapFactory.Options()
-            options.inJustDecodeBounds = true
-            BitmapFactory.decodeFile(
-                file.absolutePath, options
-            ) ?: return@use null to null
-            options.outWidth to options.outHeight
+
+            // check svg
+            val source = file.inputStream()
+            source.use {
+                if (SvgDecoder.isSvg(file.inputStream())) {
+                    try {
+                        val svg = SVG.getFromInputStream(source)
+                        Log.d("ImageCache", "SVGのサイズ: width=${svg.documentWidth}, height=${svg.documentHeight}")
+                        svg.documentWidth.toInt() to svg.documentHeight.toInt()
+                    } catch (e: SVGParseException) {
+                        Log.e("ImageCache", "SVGParseException", e)
+                        throw e
+                    }
+                } else {
+                    val options = BitmapFactory.Options()
+                    options.inJustDecodeBounds = true
+                    BitmapFactory.decodeFile(
+                        file.absolutePath, options
+                    ) ?: return null to null
+                    options.outWidth to options.outHeight
+                }
+            }
         }
     }