Remove SafeConnectable and remaining usage

DrewCarlson · May 27, 2024 · d5ccace · d5ccace
1 parent e67d603
commit d5ccace
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 236 deletions.
diff --git a/mobiuskt-core/api/android/mobiuskt-core.api b/mobiuskt-core/api/android/mobiuskt-core.api
@@ -216,23 +216,6 @@ public final class kt/mobius/Next$Companion {
 	public final fun noChange ()Lkt/mobius/Next;
 }
 
-public final class kt/mobius/SafeConnectable : kt/mobius/Connectable {
-	public fun <init> (Lkt/mobius/Connectable;)V
-	public fun connect (Lkt/mobius/functions/Consumer;)Lkt/mobius/Connection;
-}
-
-public final class kt/mobius/SafeConnectable$SafeConsumer : kt/mobius/Connection {
-	public fun <init> (Lkt/mobius/functions/Consumer;)V
-	public fun accept (Ljava/lang/Object;)V
-	public fun dispose ()V
-}
-
-public final class kt/mobius/SafeConnectable$SafeEffectConsumer : kt/mobius/Connection {
-	public fun <init> (Lkt/mobius/Connection;)V
-	public fun accept (Ljava/lang/Object;)V
-	public fun dispose ()V
-}
-
 public final class kt/mobius/SimpleLogger : kt/mobius/MobiusLoop$Logger {
 	public fun <init> (Ljava/lang/String;)V
 	public fun afterInit (Ljava/lang/Object;Lkt/mobius/First;)V

diff --git a/mobiuskt-core/api/jvm/mobiuskt-core.api b/mobiuskt-core/api/jvm/mobiuskt-core.api
@@ -216,23 +216,6 @@ public final class kt/mobius/Next$Companion {
 	public final fun noChange ()Lkt/mobius/Next;
 }
 
-public final class kt/mobius/SafeConnectable : kt/mobius/Connectable {
-	public fun <init> (Lkt/mobius/Connectable;)V
-	public fun connect (Lkt/mobius/functions/Consumer;)Lkt/mobius/Connection;
-}
-
-public final class kt/mobius/SafeConnectable$SafeConsumer : kt/mobius/Connection {
-	public fun <init> (Lkt/mobius/functions/Consumer;)V
-	public fun accept (Ljava/lang/Object;)V
-	public fun dispose ()V
-}
-
-public final class kt/mobius/SafeConnectable$SafeEffectConsumer : kt/mobius/Connection {
-	public fun <init> (Lkt/mobius/Connection;)V
-	public fun accept (Ljava/lang/Object;)V
-	public fun dispose ()V
-}
-
 public final class kt/mobius/SimpleLogger : kt/mobius/MobiusLoop$Logger {
 	public fun <init> (Ljava/lang/String;)V
 	public fun afterInit (Ljava/lang/Object;Lkt/mobius/First;)V

diff --git a/mobiuskt-core/src/commonMain/kotlin/MobiusLoopController.kt b/mobiuskt-core/src/commonMain/kotlin/MobiusLoopController.kt
@@ -92,7 +92,7 @@ internal class MobiusLoopController<M, E, F>(
         }
 
     override fun goToStateCreated(view: Connectable<M, E>, nextModelToStartFrom: M) {
-        val safeModelHandler = SafeConnectable(view)
+        val safeModelHandler = DiscardAfterDisposeConnectable(view)
         val modelConnection = safeModelHandler.connect(::dispatchEvent)
 
         goToStateCreated(modelConnection, nextModelToStartFrom)

diff --git a/mobiuskt-core/src/commonMain/kotlin/SafeConnectable.kt b/mobiuskt-core/src/commonMain/kotlin/SafeConnectable.kt
diff --git a/mobiuskt-core/src/jvmTest/kotlin/SafeConnectableTest.kt b/mobiuskt-core/src/jvmTest/kotlin/SafeConnectableTest.kt