fix(android): fix ConcurrentModificationException in AdamAndroidDevice

Closes #882
MarathonLabs · Jan 23, 2024 · ac8d57f · ac8d57f
1 parent 953ad17
commit ac8d57f
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/...r/vendor-android/src/main/kotlin/com/malinskiy/marathon/android/adam/AdamAndroidDevice.kt b/...r/vendor-android/src/main/kotlin/com/malinskiy/marathon/android/adam/AdamAndroidDevice.kt
@@ -70,6 +70,7 @@ import kotlinx.coroutines.withContext
 import java.awt.image.BufferedImage
 import java.io.File
 import java.time.Duration
+import java.util.concurrent.CopyOnWriteArrayList
 import kotlin.coroutines.CoroutineContext
 import com.malinskiy.marathon.android.model.ShellCommandResult as MarathonShellCommandResult
 
@@ -345,18 +346,14 @@ class AdamAndroidDevice(
         }
     }
 
-    private val logcatListeners = mutableListOf<LineListener>()
+    private val logcatListeners = CopyOnWriteArrayList<LineListener>()
 
     override fun addLineListener(listener: LineListener) {
-        synchronized(logcatListeners) {
-            logcatListeners.add(listener)
-        }
+        logcatListeners.add(listener)
     }
 
     override fun removeLineListener(listener: LineListener) {
-        synchronized(logcatListeners) {
-            logcatListeners.remove(listener)
-        }
+        logcatListeners.remove(listener)
     }
 
     override suspend fun safeStartScreenRecorder(