From c984e79e9588e9ca8aef76eb60a550c4ad988a36 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Thu, 30 Apr 2026 17:17:46 +0200 Subject: [PATCH] fix: use long to store the device size --- .../depau/etchdroid/massstorage/BlockDeviceInputStream.kt | 6 +++--- .../depau/etchdroid/massstorage/BlockDeviceOutputStream.kt | 4 ++-- .../main/java/eu/depau/etchdroid/service/WorkerService.kt | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/eu/depau/etchdroid/massstorage/BlockDeviceInputStream.kt b/app/src/main/java/eu/depau/etchdroid/massstorage/BlockDeviceInputStream.kt index 7d29db4..bb09dcf 100644 --- a/app/src/main/java/eu/depau/etchdroid/massstorage/BlockDeviceInputStream.kt +++ b/app/src/main/java/eu/depau/etchdroid/massstorage/BlockDeviceInputStream.kt @@ -78,7 +78,7 @@ class BlockDeviceInputStream( * The size of the block device in bytes. */ private val sizeBytes: Long - get() = blockDev.blocks.toLong() * blockDev.blockSize + get() = blockDev.blocks * blockDev.blockSize.toLong() /** * Whether the stream is at or past the end of the block device. @@ -198,7 +198,7 @@ class BlockDeviceInputStream( while (true) { val blockNumber = mReadNextBlockNumber.getAndAdd(bufferBlocks) - if (blockNumber !in 0 until blockDev.blocks) break + if (blockNumber !in 0 until (blockDev.blocks.toLong() and 0xFFFFFFFFL)) break mInFlightBlockNumber.set(blockNumber) traceIo("read $blockNumber buffer $bufferBlocks blocks start") @@ -259,7 +259,7 @@ class BlockDeviceInputStream( if (newPosition == sizeBytes) { // EOF - mCurrentBlockOffset = blockDev.blocks + mCurrentBlockOffset = blockDev.blocks.toLong() and 0xFFFFFFFFL mReadBuffer = ByteBuffer.allocate(0) return } diff --git a/app/src/main/java/eu/depau/etchdroid/massstorage/BlockDeviceOutputStream.kt b/app/src/main/java/eu/depau/etchdroid/massstorage/BlockDeviceOutputStream.kt index 4823131..044c63a 100644 --- a/app/src/main/java/eu/depau/etchdroid/massstorage/BlockDeviceOutputStream.kt +++ b/app/src/main/java/eu/depau/etchdroid/massstorage/BlockDeviceOutputStream.kt @@ -77,12 +77,12 @@ class BlockDeviceOutputStream( * The total size of the block device in bytes. */ private val mSizeBytes: Long - get() = blockDev.blocks * blockDev.blockSize + get() = blockDev.blocks * blockDev.blockSize.toLong() /** * The buffer used to store the data before it is written to the block device. */ - private var mByteBuffer = ByteBuffer.allocate(minOf(blockDev.blockSize * bufferBlocks, mSizeBytes).toInt()) + private var mByteBuffer = ByteBuffer.allocate(minOf((blockDev.blockSize.toLong() * bufferBlocks), mSizeBytes).toInt()) /** * Whether the stream position is at or past the end of the block device. diff --git a/app/src/main/java/eu/depau/etchdroid/service/WorkerService.kt b/app/src/main/java/eu/depau/etchdroid/service/WorkerService.kt index a6d59a0..f57499e 100644 --- a/app/src/main/java/eu/depau/etchdroid/service/WorkerService.kt +++ b/app/src/main/java/eu/depau/etchdroid/service/WorkerService.kt @@ -346,7 +346,7 @@ class WorkerService : LifecycleService() { var blockDev by lateInit() var rawSourceStream: InputStream? = null var currentOffset = offset - var imageSize: Long = 0 + var imageSize = 0L val coroScope = CoroutineScope(Dispatchers.IO) @@ -366,7 +366,7 @@ class WorkerService : LifecycleService() { // Resume a few blocks earlier in case things went haywire earlier currentOffset = max(currentOffset - blockDev.blockSize * BUFFER_BLOCKS * 2, 0L) - val devSize = blockDev.blocks.toLong() * blockDev.blockSize + val devSize: Long = blockDev.blocks * blockDev.blockSize.toLong() Telemetry.debug( "Device size: ${devSize.toHRSize(false)} " + "(block size: ${blockDev.blockSize.toHRSize(false)}, " +