Fixed the problem that packet id: "FAIL" was returned when UTF8 chara…

…cters appeared in the "path" parameter of the "push" method. (#71) * Fixed the problem that "java.io.IOException: Unexpected sync packet id: FAIL" was thrown when UTF8 characters appeared in the path parameter of the push method. * Fixed "No such file or directory" issue when CJK caracters appear in filename or path. & Add related test. --------- Co-authored-by: Bartek Pacia <[email protected]>
mobile-dev-inc · Sep 6, 2024 · da3d0fb · da3d0fb
1 parent b40357b
commit da3d0fb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/dadb/src/main/kotlin/dadb/AdbSync.kt b/dadb/src/main/kotlin/dadb/AdbSync.kt
@@ -45,7 +45,7 @@ class AdbSyncStream(
     @Throws(IOException::class)
     fun send(source: Source, remotePath: String, mode: Int, lastModifiedMs: Long) {
         val remote = "$remotePath,$mode"
-        writePacket(SEND, remote.length)
+        writePacket(SEND, remote.toByteArray().size)
 
         stream.sink.apply {
             writeString(remote, StandardCharsets.UTF_8)
@@ -72,7 +72,7 @@ class AdbSyncStream(
 
     @Throws(IOException::class)
     fun recv(sink: Sink, remotePath: String) {
-        writePacket(RECV, remotePath.length)
+        writePacket(RECV, remotePath.toByteArray().size)
         stream.sink.apply {
             writeString(remotePath, StandardCharsets.UTF_8)
             flush()

diff --git a/dadb/src/test/kotlin/dadb/DadbTest.kt b/dadb/src/test/kotlin/dadb/DadbTest.kt
@@ -25,7 +25,6 @@ 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.*
@@ -42,6 +41,8 @@ internal abstract class DadbTest : BaseConcurrencyTest() {
 
     private val remotePath = "/data/local/tmp/hello"
 
+    private val remotePathWithCJK = "/data/local/tmp/你好こんにちは"
+
     @JvmField
     @Rule
     val temporaryFolder = TemporaryFolder()
@@ -57,6 +58,7 @@ internal abstract class DadbTest : BaseConcurrencyTest() {
     internal fun tearDown() {
         localEmulator { dadb ->
             dadb.shell("rm -f $remotePath")
+            dadb.shell("rm -f $remotePathWithCJK")
         }
     }
 
@@ -169,6 +171,21 @@ internal abstract class DadbTest : BaseConcurrencyTest() {
         }
     }
 
+    @Test
+    fun adbPush_pathWithCJK() {
+        localEmulator { dadb ->
+            val content = randomString()
+            val localSrcFile = temporaryFolder.newFile().apply { writeText(content) }
+
+            dadb.push(localSrcFile, remotePathWithCJK, 439, System.currentTimeMillis())
+
+            val localDstFile = temporaryFolder.newFile()
+            dadb.pull(localDstFile, remotePathWithCJK)
+
+            assertThat(localDstFile.readText()).isEqualTo(content)
+        }
+    }
+
     @Test
     fun adbPush_file() {
         localEmulator { dadb ->