fix: concurrent modification exception in kotlin 1.9.20 and compose 1…

….5.10 (#245) * fix: concurrent modification exception in kotlin 1.9.20 and compose 1.5.10 * copying collection * removing unsed import
adrielcafe · Nov 5, 2023 · 68381cc · 68381cc
1 parent d6b7e5e
commit 68381cc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/voyager-core/src/commonMain/kotlin/cafe/adriel/voyager/core/model/ScreenModelStore.kt b/voyager-core/src/commonMain/kotlin/cafe/adriel/voyager/core/model/ScreenModelStore.kt
@@ -113,7 +113,7 @@ public object ScreenModelStore : ScreenDisposable {
 
 
     private fun Map<String, *>.onEachHolder(holderKey: String, block: (String) -> Unit) =
-        asSequence()
+        toMap() // copy
             .filter { it.key.startsWith(holderKey) }
             .map { it.key }
             .forEach(block)

diff --git a/...er-core/src/nativeMain/kotlin/cafe.adriel.voyager.core/concurrent/ThreadSafeMap.native.kt b/...er-core/src/nativeMain/kotlin/cafe.adriel.voyager.core/concurrent/ThreadSafeMap.native.kt
@@ -29,11 +29,11 @@ public actual class ThreadSafeMap<K, V>(
     }
 
     override val entries: MutableSet<MutableMap.MutableEntry<K, V>>
-        get() = delegate.entries
+        get() = synchronized(syncObject) { delegate.entries.toMutableSet() }
     override val keys: MutableSet<K>
-        get() = delegate.keys
+        get() = synchronized(syncObject) { delegate.keys.toMutableSet() }
     override val values: MutableCollection<V>
-        get() = delegate.values
+        get() = synchronized(syncObject) { delegate.values.toMutableList() }
 
     override fun clear() {
         synchronized(syncObject) { delegate.clear() }