feat: allow installation from inputstream

mobile-dev-inc · Dec 31, 2023 · 01323f0 · 01323f0
1 parent 447f9b4
commit 01323f0
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 8 deletions.
diff --git a/dadb/src/main/kotlin/dadb/Dadb.kt b/dadb/src/main/kotlin/dadb/Dadb.kt
@@ -19,10 +19,10 @@ package dadb
 
 import dadb.adbserver.AdbServer
 import dadb.forwarding.TcpForwarder
-import okio.*
 import java.io.File
-import java.io.IOException
+import java.io.InputStream
 import java.nio.file.Files
+import okio.*
 
 interface Dadb : AutoCloseable {
 
@@ -77,22 +77,39 @@ interface Dadb : AutoCloseable {
     @Throws(IOException::class)
     fun install(file: File, vararg options: String) {
         if (supportsFeature("cmd")) {
-            execCmd("package", "install", "-S", file.length().toString(), *options).use { stream ->
-                stream.sink.writeAll(file.source())
+            install(file.source(), file.length(), *options)
+        } else {
+            pmInstall(file, *options)
+        }
+    }
+
+    @Throws(IOException::class)
+    fun install(source: Source, size: Long, vararg options: String) {
+        if (supportsFeature("cmd")) {
+            execCmd("package", "install", "-S", size.toString(), *options).use { stream ->
+                stream.sink.writeAll(source)
                 stream.sink.flush()
                 val response = stream.source.readString(Charsets.UTF_8)
                 if (!response.startsWith("Success")) {
                     throw IOException("Install failed: $response")
                 }
             }
         } else {
-            val fileName = file.name
-            val remotePath = "/data/local/tmp/$fileName"
-            push(file, remotePath)
-            shell("pm install ${options.joinToString(" ")} \"$remotePath\"")
+            val tempFile = kotlin.io.path.createTempFile()
+            val fileSink = tempFile.sink().buffer()
+            fileSink.writeAll(source)
+            fileSink.flush()
+            pmInstall(tempFile.toFile(), *options)
         }
     }
 
+    private fun pmInstall(file: File, vararg options: String) {
+        val fileName = file.name
+        val remotePath = "/data/local/tmp/$fileName"
+        push(file, remotePath)
+        shell("pm install ${options.joinToString(" ")} \"$remotePath\"")
+    }
+
     @Throws(IOException::class)
     fun installMultiple(apks: List<File>, vararg options: String) {
         // http://aospxref.com/android-12.0.0_r3/xref/packages/modules/adb/client/adb_install.cpp#538

diff --git a/dadb/src/test/kotlin/dadb/DadbTest.kt b/dadb/src/test/kotlin/dadb/DadbTest.kt
@@ -24,6 +24,8 @@ import okio.source
 import org.junit.Rule
 import org.junit.rules.TemporaryFolder
 import java.io.ByteArrayInputStream
+import java.io.FileInputStream
+import java.io.FileOutputStream
 import java.net.Socket
 import java.nio.charset.StandardCharsets
 import java.util.*
@@ -191,6 +193,16 @@ internal abstract class DadbTest : BaseConcurrencyTest() {
         }
     }
 
+    @Test
+    fun installStream() {
+        localEmulator { dadb ->
+            val inputStream = FileInputStream(TestApk.FILE).source()
+            dadb.install(inputStream, TestApk.FILE.length())
+            val response = dadb.shell("pm list packages ${TestApk.PACKAGE_NAME}")
+            assertShellResponse(response, 0, "package:${TestApk.PACKAGE_NAME}\n")
+        }
+    }
+
     @Test
     fun installMultiple() {
         localEmulator { dadb ->