cyy/Fairscan_cyy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Throw explicit exceptions when decoding images to import

Browse Source
This commit is contained in:
Pierre-Yves Nicolas
2026-04-10 07:35:22 +02:00
parent 31155275e8
commit 479680a83d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/fairscan/app/platform/AndroidImageLoader.kt
View File

@@ -26,6 +26,7 @@ import androidx.core.util.component2
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import org.fairscan.app.domain.ImageLoader import org.fairscan.app.domain.ImageLoader
import java.io.IOException
class AndroidImageLoader( class AndroidImageLoader(
private val contentResolver: ContentResolver private val contentResolver: ContentResolver
@@ -64,10 +65,13 @@ private fun decodeWithImageDecoder(
} }
private fun decodeWithBitmapFactory(contentResolver: ContentResolver, uri: Uri, ): Bitmap { private fun decodeWithBitmapFactory(contentResolver: ContentResolver, uri: Uri, ): Bitmap {
val decodeOptions = BitmapFactory.Options() val options = BitmapFactory.Options()
return contentResolver.openInputStream(uri).use { val inputStream = contentResolver.openInputStream(uri)
BitmapFactory.decodeStream(it, null, decodeOptions) ?: throw IOException("Cannot open input stream for uri: $uri")
}!! return inputStream.use {
BitmapFactory.decodeStream(it, null, options)
?: throw IOException("Failed to decode bitmap for uri: $uri")
}
} }
private fun computeScale(width: Int, height: Int, maxPixels: Int): Float { private fun computeScale(width: Int, height: Int, maxPixels: Int): Float {