Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue #296 Dispose NodeConnector intake in onDestroy #297

Open
wants to merge 1 commit into
base: 1.x
Choose a base branch
from
Open

Issue #296 Dispose NodeConnector intake in onDestroy #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Pending changes

–
- [#296](https://github.com/bumble-tech/appyx/issues/296) – **Fixed**: `NodeConnector.intake` is now disposed when a `Node` is destroyed.

---

Expand Down
6 changes: 4 additions & 2 deletions ...ies/interop-rx2/src/main/kotlin/com/bumble/appyx/interop/rx2/connectable/NodeConnector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import com.bumble.appyx.core.lifecycle.subscribe
import com.jakewharton.rxrelay2.PublishRelay
import com.jakewharton.rxrelay2.Relay
import io.reactivex.Observer
import io.reactivex.disposables.Disposable

class NodeConnector<Input, Output>(
override val input: Relay<Input> = PublishRelay.create(),
Expand All @@ -15,6 +16,7 @@ class NodeConnector<Input, Output>(
private val exhaust: Relay<Output> = PublishRelay.create()
private var isFlushed = false
private val outputCache = mutableListOf<Output>()
private var intakeDisposable: Disposable? = null

override val output: Relay<Output> = object : Relay<Output>() {

Expand All @@ -31,7 +33,7 @@ class NodeConnector<Input, Output>(
}

override fun onCreate(lifecycle: Lifecycle) {
lifecycle.subscribe(onCreate = { flushOutputCache() })
lifecycle.subscribe(onCreate = { flushOutputCache() }, onDestroy = { intakeDisposable?.dispose() })
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possibly we should log an error, or raise an exception if input/output is invoked after onDestroy is called, rather than just swallowing silently?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can't skip onCreate callback. androidx.lifecycle.LifecycleRegistry.moveToState forbids going from initialised state to destroyed.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry, I wasn't talking about lifecycles here @CherryPerry. I meant if someone called input.accept/output.accept after onDestroy for the node was called.

In this case the output event would be ignored, but the input event would not.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMHO do not see it as a problem that we should take care of, swallowing is OK for me.

}

private val cacheSubscription = intake.subscribe {
Expand All @@ -55,7 +57,7 @@ class NodeConnector<Input, Output>(
}

private fun switchToExhaust() {
intake.subscribe { exhaust.accept(it) }
intakeDisposable = intake.subscribe { exhaust.accept(it) }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

intake.subscribe(exhaust)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

makes sense

cacheSubscription.dispose()
}
}