#810 remove legacy internal methods and safely iterate over observabl…

…e listeners
splendo · Sep 23, 2024 · ff60fe1 · ff60fe1
1 parent 63eed61
commit ff60fe1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/architecture/src/commonMain/kotlin/observable/Disposable.kt b/architecture/src/commonMain/kotlin/observable/Disposable.kt
@@ -27,16 +27,6 @@ import kotlin.jvm.JvmName
 
 typealias DisposeHandler = () -> Unit
 
-internal fun <R : T, T, OO : ObservableOptional<R>> addObserver(observation: Observation<R, T, OO>, observer: (R) -> Unit) {
-    observation.observers.add(observer)
-}
-
-internal fun <R : T, T, OO : ObservableOptional<R>> removeObserver(observation: Observation<R, T, OO>, observer: (R) -> Unit) {
-    observation.observers.remove(observer)
-}
-
-internal fun <R : T, T, OO : ObservableOptional<R>> observers(observation: Observation<R, T, OO>): List<(R) -> Unit> = observation.observers
-
 /**
  * Reference to an object that should be disposed in time
  */

diff --git a/architecture/src/commonMain/kotlin/observable/Observation.kt b/architecture/src/commonMain/kotlin/observable/Observation.kt
@@ -108,8 +108,10 @@ open class Observation<R : T, T, OO : ObservableOptional<R>>(override val initia
 
             val result = (v as? ObservableOptional.Value<*>)?.value as R
 
-            observers(this@Observation).forEach {
-                it(result)
+            this@Observation.observers.synchronized {
+                forEach {
+                    it(result)
+                }
             }
             return v as ObservableOptional<T>
         }
@@ -139,7 +141,7 @@ open class Observation<R : T, T, OO : ObservableOptional<R>>(override val initia
         // send the value before adding
         val lastResult = currentObserved
         onNext((lastResult as? ObservableOptional.Value<*>)?.value as R)
-        addObserver(this@Observation, onNext)
+        this@Observation.observers.add(onNext)
         // adding an observer often happens concurrently with initialization,
         // if we detect a change in the current observed value we re-send it to the added observer
         val newResult = currentObserved
@@ -148,7 +150,7 @@ open class Observation<R : T, T, OO : ObservableOptional<R>>(override val initia
         }
         SimpleDisposable {
             handleOnMain {
-                removeObserver(this@Observation, onNext)
+                this@Observation.observers.remove(onNext)
             }
         }
     }