diff --git a/Android.bp b/Android.bp index 7b811038..b8d55b23 100644 --- a/Android.bp +++ b/Android.bp @@ -37,7 +37,6 @@ android_app { "seedvault-lib-androidx-lifecycle-viewmodel-ktx", "seedvault-lib-koin-android", "seedvault-lib-koin-androidx-viewmodel", - "seedvault-lib-commons-io", "seedvault-lib-koin-core", "seedvault-lib-novacrypto-bip39", "seedvault-lib-novacrypto-sha256", diff --git a/app/build.gradle b/app/build.gradle index b6207c71..d598e1cd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -121,7 +121,6 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation 'commons-io:commons-io:2.6' implementation 'io.github.novacrypto:BIP39:2019.01.27' implementation 'org.koin:koin-androidx-viewmodel:2.0.1' diff --git a/app/src/main/java/com/stevesoltys/seedvault/transport/backup/FullBackup.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/FullBackup.kt index 0053a3b9..e2819f21 100644 --- a/app/src/main/java/com/stevesoltys/seedvault/transport/backup/FullBackup.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/FullBackup.kt @@ -12,7 +12,7 @@ import com.stevesoltys.seedvault.crypto.Crypto import com.stevesoltys.seedvault.header.HeaderWriter import com.stevesoltys.seedvault.header.VersionHeader import libcore.io.IoUtils.closeQuietly -import org.apache.commons.io.IOUtils +import java.io.EOFException import java.io.IOException import java.io.InputStream import java.io.OutputStream @@ -156,7 +156,9 @@ internal class FullBackup( state.outputStreamInit = null // the stream init lambda is not needed beyond that point // read backup data, encrypt it and write it to output stream - val payload = IOUtils.readFully(state.inputStream, numBytes) + val payload = ByteArray(numBytes) + val read = state.inputStream.read(payload, 0, numBytes) + if (read != numBytes) throw EOFException("Read $read bytes instead of $numBytes.") crypto.encryptSegment(outputStream, payload) TRANSPORT_OK } catch (e: IOException) { diff --git a/libs/Android.bp b/libs/Android.bp index 63a674da..669f0c15 100644 --- a/libs/Android.bp +++ b/libs/Android.bp @@ -34,13 +34,6 @@ android_library_import { sdk_version: "current", } -java_import { - name: "seedvault-lib-commons-io", - host_supported: true, - jars: ["commons-io-2.6.jar"], - sdk_version: "current", -} - java_import { name: "seedvault-lib-koin-core", host_supported: true, diff --git a/libs/commons-io-2.6.jar b/libs/commons-io-2.6.jar deleted file mode 100644 index 00556b11..00000000 Binary files a/libs/commons-io-2.6.jar and /dev/null differ