Browse Source

[resources] Read exactly requested count of bytes from InputStream on jvm platforms. (#4943)

In some cases the skip and read methods may handle less bytes then
expected. The PR fixes it by proper API on the JVM and manual check on
the Android.

Fixes https://github.com/JetBrains/compose-multiplatform/issues/4938

## Testing
I manually checked it on the project from the issue.

## Release Notes
### Fixes - Resources
- Read exactly requested count of bytes from InputStream on jvm
platforms.
pull/4988/head v1.6.20-dev1673
Konstantin 6 months ago committed by GitHub
parent
commit
8432577f5d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 24
      components/resources/library/src/androidMain/kotlin/org/jetbrains/compose/resources/ResourceReader.android.kt
  2. 4
      components/resources/library/src/desktopMain/kotlin/org/jetbrains/compose/resources/ResourceReader.desktop.kt

24
components/resources/library/src/androidMain/kotlin/org/jetbrains/compose/resources/ResourceReader.android.kt

@ -13,12 +13,32 @@ internal actual fun getPlatformResourceReader(): ResourceReader = object : Resou
val resource = getResourceAsStream(path) val resource = getResourceAsStream(path)
val result = ByteArray(size.toInt()) val result = ByteArray(size.toInt())
resource.use { input -> resource.use { input ->
input.skip(offset) input.skipBytes(offset)
input.read(result, 0, size.toInt()) input.readBytes(result, 0, size.toInt())
} }
return result return result
} }
//skipNBytes requires API 34
private fun InputStream.skipBytes(offset: Long) {
var skippedBytes = 0L
while (skippedBytes < offset) {
val count = skip(offset - skippedBytes)
if (count == 0L) break
skippedBytes += count
}
}
//readNBytes requires API 34
private fun InputStream.readBytes(byteArray: ByteArray, offset: Int, size: Int) {
var readBytes = 0
while (readBytes < size) {
val count = read(byteArray, offset + readBytes, size - readBytes)
if (count <= 0) break
readBytes += count
}
}
override fun getUri(path: String): String { override fun getUri(path: String): String {
val classLoader = getClassLoader() val classLoader = getClassLoader()
val resource = classLoader.getResource(path) ?: run { val resource = classLoader.getResource(path) ?: run {

4
components/resources/library/src/desktopMain/kotlin/org/jetbrains/compose/resources/ResourceReader.desktop.kt

@ -12,8 +12,8 @@ internal actual fun getPlatformResourceReader(): ResourceReader = object : Resou
val resource = getResourceAsStream(path) val resource = getResourceAsStream(path)
val result = ByteArray(size.toInt()) val result = ByteArray(size.toInt())
resource.use { input -> resource.use { input ->
input.skip(offset) input.skipNBytes(offset)
input.read(result, 0, size.toInt()) input.readNBytes(result, 0, size.toInt())
} }
return result return result
} }

Loading…
Cancel
Save