Sync android-sdk with js-sdk: Implement updates to v0.4.27

docker/docker-compose-ci.yml

@@ -2,7 +2,7 @@ version: '3.3'
 
 services:
   yorkie:
-    image: 'yorkieteam/yorkie:0.4.24'
+    image: 'yorkieteam/yorkie:0.4.27'
     container_name: 'yorkie'
     command: ['server', '--mongo-connection-uri', 'mongodb://mongo:27017']
     restart: always

docker/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.3'
 
 services:
   yorkie:
-    image: 'yorkieteam/yorkie:0.4.24'
+    image: 'yorkieteam/yorkie:0.4.27'
     container_name: 'yorkie'
     command: ['server', '--enable-pprof']
     restart: always

gradle.properties

@@ -11,7 +11,7 @@ android.suppressUnsupportedOptionWarnings=android.suppressUnsupportedOptionWarni
 kotlin.code.style=official
 kotlin.mpp.stability.nowarn=true
 GROUP=dev.yorkie
-VERSION_NAME=0.4.25-rc
+VERSION_NAME=0.4.27-rc
 POM_DESCRIPTION=Document store for building collaborative editing applications.
 POM_INCEPTION_YEAR=2022
 POM_URL=https://github.com/yorkie-team/yorkie-android-sdk

gradle/libs.versions.toml

@@ -3,16 +3,16 @@ minSdk = "24"
 compileSdk = "34"
 targetSdk = "34"
 agp = "8.5.0"
-connectKotlin = "0.6.1"
+connectKotlin = "0.7.0"
 okhttp = "4.12.0"
 coroutines = "1.8.1"
-androidxActivity = "1.9.0"
-androidxLifecycle = "2.8.2"
-androidxBenchmark = "1.2.4"
+androidxActivity = "1.9.1"
+androidxLifecycle = "2.8.4"
+androidxBenchmark = "1.3.0"
 androidxComposeCompiler = "1.5.14"
 
 [libraries]
-androidx-annotation = { module = "androidx.annotation:annotation", version = "1.8.0" }
+androidx-annotation = { module = "androidx.annotation:annotation", version = "1.8.2" }
 connect-kotlin-google-javalite-ext = { module = "com.connectrpc:connect-kotlin-google-javalite-ext", version.ref = "connectKotlin" }
 connect-kotlin-okhttp = { module = "com.connectrpc:connect-kotlin-okhttp", version.ref = "connectKotlin" }
 okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
@@ -46,10 +46,10 @@ gson = { group = "com.google.code.gson", name = "gson", version = "2.11.0" }
 
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
 junit = { group = "junit", name = "junit", version = "4.13.2" }
-androidx-test-runner = { group = "androidx.test", name = "runner", version = "1.5.2" }
-androidx-test-junit = { group = "androidx.test.ext", name = "junit-ktx", version = "1.1.5" }
-androidx-test-monitor = { group = "androidx.test", name = "monitor", version = "1.6.1" }
-androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version = "3.5.1" }
+androidx-test-runner = { group = "androidx.test", name = "runner", version = "1.6.2" }
+androidx-test-junit = { group = "androidx.test.ext", name = "junit-ktx", version = "1.2.1" }
+androidx-test-monitor = { group = "androidx.test", name = "monitor", version = "1.7.2" }
+androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version = "3.6.1" }
 mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version = "4.1.0" }
 
 [bundles]

yorkie/src/androidTest/kotlin/dev/yorkie/core/ClientTest.kt

@@ -20,8 +20,11 @@ import dev.yorkie.document.json.JsonTreeTest.Companion.rootTree
 import dev.yorkie.document.json.TreeBuilder.element
 import dev.yorkie.document.json.TreeBuilder.text
 import dev.yorkie.document.operation.OperationInfo
+import dev.yorkie.util.YorkieException
+import dev.yorkie.util.YorkieException.Code.*
 import java.util.UUID
 import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
 import kotlin.test.assertFalse
 import kotlin.test.assertIs
 import kotlin.test.assertNotEquals
@@ -890,4 +893,72 @@ class ClientTest {
             collectJobs.forEach(Job::cancel)
         }
     }
+
+    @Test
+    fun test_should_throw_exceptions_attach_and_detach_document() {
+        runBlocking {
+            val c1 = createClient()
+            val key = UUID.randomUUID().toString().toDocKey()
+            val d1 = Document(key)
+
+            // Test that attaching an already attached document throws an error
+            val activatedException = assertFailsWith<YorkieException> {
+                c1.attachAsync(d1).await()
+            }
+            assertEquals(ErrClientNotActivated, activatedException.code)
+
+            c1.activateAsync().await()
+
+            c1.attachAsync(d1).await()
+
+            // Test that attaching an already attached document throws an error
+            val attachException = assertFailsWith<YorkieException> {
+                c1.attachAsync(d1).await()
+            }
+            assertEquals(ErrDocumentNotDetached, attachException.code)
+
+            c1.detachAsync(d1).await()
+
+            // Test that detaching an already detached document throws an error
+            val detachException = assertFailsWith<YorkieException> {
+                c1.detachAsync(d1).await()
+            }
+            assertEquals(ErrDocumentNotAttached, detachException.code)
+
+            c1.deactivateAsync().await()
+            d1.close()
+            c1.close()
+        }
+    }
+
+    @Test
+    fun test_should_handle_local_changes_correctly_when_receiving_snapshot() {
+        withTwoClientsAndDocuments(syncMode = Manual) { c1, c2, d1, d2, _ ->
+            d1.updateAsync { root, _ ->
+                root.setNewCounter("counter", 0)
+            }.await()
+
+            c1.syncAsync().await()
+            c2.syncAsync().await()
+
+            // 01. c1 increases the counter for creating snapshot.
+            repeat(500) {
+                d1.updateAsync { root, _ ->
+                    root.getAs<JsonCounter>("counter").increase(1)
+                }.await()
+            }
+            c1.syncAsync().await()
+
+            // 02. c2 receives the snapshot and increases the counter simultaneously.
+            // The tc in js-sdk, it performed the sync before update, but it is not necessary.
+            // so, it is not implemented in android sdk.
+            d2.updateAsync { root, _ ->
+                root.getAs<JsonCounter>("counter").increase(1)
+            }.await()
+
+            c2.syncAsync().await()
+            c1.syncAsync().await()
+            assertEquals(d1.toJson(), d2.toJson())
+        }
+    }
 }