Dispose UI Events subscription only on destroy

Author: Arkadii Ivanov

mvidroid/src/main/java/com/arkivanov/mvidroid/bind/BindUtils.kt

@@ -5,6 +5,7 @@ import android.arch.lifecycle.LifecycleOwner
 import android.support.annotation.MainThread
 import com.arkivanov.mvidroid.component.MviComponent
 import com.arkivanov.mvidroid.view.MviView
+import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
 
 /**
@@ -22,23 +23,25 @@ fun <UiEvent : Any, States : Any, Component : MviComponent<UiEvent, States>> bin
     component: Component,
     vararg bundles: MviViewBundle<States, *, out UiEvent>
 ): MviLifecycleObserver {
-    val disposables = ArrayList<Disposable>(bundles.size * 2)
+    val onStopDisposables = ArrayList<Disposable>(bundles.size)
+    val onDestroyDisposables = CompositeDisposable()
 
     bundles.forEach {
-        disposables.add(it.view.uiEvents.subscribe { component(it) })
+        onDestroyDisposables.add(it.view.uiEvents.subscribe { component(it) })
     }
 
     return object : MviLifecycleObserver {
         override fun onStart() {
-            bundles.forEach { disposables.add(it.subscribe(component.states)) }
+            bundles.forEach { onStopDisposables.add(it.subscribe(component.states)) }
         }
 
         override fun onStop() {
-            disposables.forEach(Disposable::dispose)
-            disposables.clear()
+            onStopDisposables.forEach(Disposable::dispose)
+            onStopDisposables.clear()
         }
 
         override fun onDestroy() {
+            onDestroyDisposables.dispose()
             component.dispose()
         }
     }

mvidroid/src/test/java/com/arkivanov/mvidroid/bind/BindUtilsTest.kt

@@ -1,8 +1,5 @@
 package com.arkivanov.mvidroid.bind
 
-import com.arkivanov.mvidroid.bind.MviViewBundle
-import com.arkivanov.mvidroid.bind.MviViewModelMapper
-import com.arkivanov.mvidroid.bind.bind
 import com.arkivanov.mvidroid.component.MviComponent
 import com.arkivanov.mvidroid.view.MviView
 import com.jakewharton.rxrelay2.PublishRelay
@@ -49,6 +46,14 @@ class BindUtilsTest {
         verify(component)("event")
     }
 
+    @Test
+    fun `component received event WHEN stopped AND view published`() {
+        observer.onStart()
+        observer.onStop()
+        uiEventRelay.accept("event")
+        verify(component)("event")
+    }
+
     @Test
     fun `view model not received by view WHEN emitted AND observer not started`() {
         viewModelRelay.accept("model")