avoid ConcurrentModificationException when clearing store

freeletics · May 28, 2024 · 2319502 · 2319502
1 parent 03910e2
commit 2319502
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...androidMain/kotlin/com/freeletics/khonshu/navigation/internal/StackEntryStoreViewModel.kt b/...androidMain/kotlin/com/freeletics/khonshu/navigation/internal/StackEntryStoreViewModel.kt
@@ -19,9 +19,9 @@ internal class StackEntryStoreViewModel(
     }
 
     public override fun onCleared() {
-        for (store in stores.values) {
-            store.close()
+        while (stores.isNotEmpty()) {
+            val key = stores.firstNotNullOf { it.key }
+            stores.remove(key)?.close()
         }
-        stores.clear()
     }
 }