From d4c56d906df6687364fc89e584746cb4c75c05d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Billstro=CC=88m?= <peter.billstrom@gmail.com>
Date: Mon, 5 Nov 2018 15:07:59 +0100
Subject: [PATCH] Clean up ArchiveInputStream.

---
 .../dfu/internal/ArchiveInputStream.java      | 35 +++++++------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/dfu/src/main/java/no/nordicsemi/android/dfu/internal/ArchiveInputStream.java b/dfu/src/main/java/no/nordicsemi/android/dfu/internal/ArchiveInputStream.java
index 99c5986..fbb8ce0 100644
--- a/dfu/src/main/java/no/nordicsemi/android/dfu/internal/ArchiveInputStream.java
+++ b/dfu/src/main/java/no/nordicsemi/android/dfu/internal/ArchiveInputStream.java
@@ -357,23 +357,18 @@ public class ArchiveInputStream extends InputStream {
 
 	@Override
 	public int read(@NonNull final byte[] buffer, final int offset, final int length) {
-		int maxSize = currentSource.length - bytesReadFromCurrentSource;
-		int size = length <= maxSize ? length : maxSize;
+		final int size = rawRead(buffer, offset, length);
+		if (length > size && startNextFile() != null) {
+			return size + rawRead(buffer, offset + size, length - size);
+		}
+		return size;
+	}
+
+	private int rawRead(@NonNull final byte[] buffer, final int offset, final int length) {
+		final int maxSize = currentSource.length - bytesReadFromCurrentSource;
+		final int size = length <= maxSize ? length : maxSize;
 		System.arraycopy(currentSource, bytesReadFromCurrentSource, buffer, offset, size);
 		bytesReadFromCurrentSource += size;
-		if (length > size) {
-			if (startNextFile() == null) {
-				bytesRead += size;
-				crc32.update(buffer, offset, size);
-				return size;
-			}
-
-			maxSize = currentSource.length;
-			final int nextSize = length - size <= maxSize ? length - size : maxSize;
-			System.arraycopy(currentSource, 0, buffer, offset + size, nextSize);
-			bytesReadFromCurrentSource += nextSize;
-			size += nextSize;
-		}
 		bytesRead += size;
 		crc32.update(buffer, offset, size);
 		return size;
@@ -395,7 +390,7 @@ public class ArchiveInputStream extends InputStream {
 	}
 
 	@Override
-	public void reset() throws IOException {
+	public void reset() {
 		currentSource = markedSource;
 		bytesRead = bytesReadFromCurrentSource = bytesReadFromMarkedSource;
 
@@ -479,12 +474,8 @@ public class ArchiveInputStream extends InputStream {
 		else if ((type & DfuBaseService.TYPE_APPLICATION) > 0)
 			currentSource = applicationBytes;
 		bytesReadFromCurrentSource = 0;
-		try {
-			mark(0);
-			reset();
-		} catch (final IOException e) {
-			// not available
-		}
+		mark(0);
+		reset();
 		return this.type;
 	}