review

gradle.properties

@@ -20,3 +20,5 @@ org.gradle.jvmargs=-Xmx1024m
 # The Android Gradle Plugin uses deprecated APIs, they have until Gradle 6.0 to fix their crap.
 # https://android.googlesource.com/platform/tools/base/+/studio-master-dev/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/scope/BuildArtifactsHolder.kt
 org.gradle.warning.mode=none
+android.enableJetifier=true
+android.useAndroidX=true

tanker-bindings/src/main/kotlin/io/tanker/api/AsynchronousByteChannelWrapper.kt

@@ -6,7 +6,7 @@ import java.nio.channels.AsynchronousByteChannel
 import java.nio.channels.CompletionHandler
 
 @RequiresApi(26)
-class AsynchronousByteChannelWrapper(private val channel: AsynchronousByteChannel) : TankerAsynchronousByteChannel {
+internal class AsynchronousByteChannelWrapper(private val channel: AsynchronousByteChannel) : TankerAsynchronousByteChannel {
     override fun close() {
         channel.close()
     }
@@ -15,15 +15,16 @@ class AsynchronousByteChannelWrapper(private val channel: AsynchronousByteChanne
         return channel.isOpen
     }
 
-    override fun <A> read(dst: ByteBuffer?, attachment: A, handler: TankerCompletionHandler<Int, in A>?) {
+    override fun <A> read(dst: ByteBuffer, attachment: A, handler: TankerCompletionHandler<Int, in A>) {
+        // CompletionHandler is API 26 only, hence the boilerplate
         channel.read(dst, attachment, object : CompletionHandler<Int, A> {
             override fun completed(result: Int, attachment: A) {
-                handler!!.completed(result, attachment)
+                handler.completed(result, attachment)
             }
 
             override fun failed(exc: Throwable, attachment: A) {
-                handler!!.failed(exc, attachment)
+                handler.failed(exc, attachment)
             }
         })
     }
-}
+}

tanker-bindings/src/main/kotlin/io/tanker/api/InputStreamWrapper.kt

@@ -1,34 +1,37 @@
 package io.tanker.api
 
+import java.io.IOException
 import java.io.InputStream
 import java.nio.ByteBuffer
-import java.util.concurrent.Future
 
-class InputStreamWrapper(private val inputStream: InputStream) : TankerAsynchronousByteChannel {
-    companion object {
-        private var isClosed = false
-    }
-
-    override fun <A> read(dst: ByteBuffer?, attachment: A, handler: TankerCompletionHandler<Int, in A>?) {
+class InputStreamWrapper(private var inputStream: InputStream?) : TankerAsynchronousByteChannel {
+    override fun <A> read(dst: ByteBuffer, attachment: A, handler: TankerCompletionHandler<Int, in A>) {
         TankerFuture.threadPool.execute {
-            try {
-                val b = ByteArray(dst!!.remaining())
-                val nbRead = inputStream.read(b)
-                if (nbRead != -1) {
-                    dst.put(b, 0, nbRead)
+            if (!isOpen)
+                handler.failed(IOException("Stream is closed"), attachment)
+            else {
+                try {
+                    val b = ByteArray(dst.remaining())
+                    val nbRead = inputStream!!.read(b)
+                    if (nbRead != -1) {
+                        dst.put(b, 0, nbRead)
+                    }
+                    handler.completed(nbRead, attachment)
+                } catch (e: Throwable) {
+                    handler.failed(e, attachment)
                 }
-                handler!!.completed(nbRead, attachment)
-            } catch (e: Throwable) {
-                handler!!.failed(e, attachment)
             }
         }
     }
+
     override fun isOpen(): Boolean {
-        return !isClosed
+        return inputStream != null
     }
 
     override fun close() {
-        inputStream.close()
-        isClosed = true
+        if (inputStream != null) {
+            inputStream!!.close()
+            inputStream = null
+        }
     }
 }