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

Make children immutable to avoid concurrent modification exception #387

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Make children immutable to avoid concurrent modification exception #387

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
64 changes: 59 additions & 5 deletions libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ open class Node<V : RibView> @VisibleForTesting internal constructor(
is AncestryInfo.Child -> ancestryInfo.anchor
}

private var isDestroyed: Boolean = false
Copy link
Collaborator

Choose a reason for hiding this comment

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

get() = lifecycleManager.ribLifecycle.state == Lifecycle.DESTROYED to eliminate possibility of desynchronisation of properties.


val plugins: List<Plugin> =
buildContext.defaultPlugins(this) + plugins + if (this is Plugin) listOf(this) else emptyList()

Expand All @@ -107,9 +109,8 @@ open class Node<V : RibView> @VisibleForTesting internal constructor(

internal val externalLifecycleRegistry = LifecycleRegistry(this)

@VisibleForTesting
internal val _children: MutableList<Node<*>> = mutableListOf()
val children: List<Node<*>> get() = _children
var children: List<Node<*>> = listOf()
internal set

internal open val lifecycleManager = LifecycleManager(this)

Expand Down Expand Up @@ -145,6 +146,14 @@ open class Node<V : RibView> @VisibleForTesting internal constructor(

@CallSuper
open fun onCreate() {
if (isDestroyed) {
RIBs.errorHandler.handleNonFatalError(
"Calling onCreate when Node has been destroyed. $this",
RuntimeException("Calling onCreate when Node has been destroyed. $this")
)
return
}

plugins
.filterIsInstance<NodeLifecycleAware>()
.forEach { it.onCreate(lifecycleManager.ribLifecycle.lifecycle) }
Expand Down Expand Up @@ -209,6 +218,16 @@ open class Node<V : RibView> @VisibleForTesting internal constructor(
}

open fun onDestroy(isRecreating: Boolean) {
if (isDestroyed) {
RIBs.errorHandler.handleNonFatalError(
"Calling onDestroy when Node has been destroyed. $this",
RuntimeException("Calling onDestroy when Node has been destroyed. $this")
)
return
}

isDestroyed = true

if (view != null) {
RIBs.errorHandler.handleNonFatalError(
"View was not detached before node detach!",
Expand Down Expand Up @@ -237,7 +256,8 @@ open class Node<V : RibView> @VisibleForTesting internal constructor(
@MainThread
fun attachChildNode(child: Node<*>) {
verifyNotRoot(child)
_children.add(child)
val newChildren = children.toMutableList().apply { add(child) }
Copy link
Collaborator

Choose a reason for hiding this comment

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

children + child instead?

children = newChildren
lifecycleManager.onAttachChild(child)
child.onCreate()
onAttachChildNode(child)
Expand Down Expand Up @@ -309,7 +329,9 @@ open class Node<V : RibView> @VisibleForTesting internal constructor(
@MainThread
fun detachChildNode(child: Node<*>, isRecreating: Boolean) {
plugins.filterIsInstance<SubtreeChangeAware>().forEach { it.onChildDetached(child) }
_children.remove(child)

val newChildren = children.toMutableList().apply { remove(child) }
children = newChildren
child.onDestroy(isRecreating)
}

Expand All @@ -325,6 +347,14 @@ open class Node<V : RibView> @VisibleForTesting internal constructor(
* To be called from the hosting environment (Activity, Fragment, etc.)
*/
fun onStart() {
if (isDestroyed) {
RIBs.errorHandler.handleNonFatalError(
"Calling onStart when Node has been destroyed. $this",
RuntimeException("Calling onStart when Node has been destroyed. $this")
)
return
}

lifecycleManager.onStartExternal()
plugins.filterIsInstance<AndroidLifecycleAware>().forEach { it.onStart() }
}
Expand All @@ -333,6 +363,14 @@ open class Node<V : RibView> @VisibleForTesting internal constructor(
* To be called from the hosting environment (Activity, Fragment, etc.)
*/
fun onStop() {
if (isDestroyed) {
RIBs.errorHandler.handleNonFatalError(
"Calling onStop when Node has been destroyed. $this",
RuntimeException("Calling onStop when Node has been destroyed. $this")
)
return
}

lifecycleManager.onStopExternal()
plugins.filterIsInstance<AndroidLifecycleAware>().forEach { it.onStop() }
}
Expand All @@ -341,6 +379,14 @@ open class Node<V : RibView> @VisibleForTesting internal constructor(
* To be called from the hosting environment (Activity, Fragment, etc.)
*/
fun onResume() {
if (isDestroyed) {
RIBs.errorHandler.handleNonFatalError(
"Calling onResume when Node has been destroyed. $this",
RuntimeException("Calling onResume when Node has been destroyed. $this")
)
return
}

lifecycleManager.onResumeExternal()
plugins.filterIsInstance<AndroidLifecycleAware>().forEach { it.onResume() }
}
Expand All @@ -349,6 +395,14 @@ open class Node<V : RibView> @VisibleForTesting internal constructor(
* To be called from the hosting environment (Activity, Fragment, etc.)
*/
fun onPause() {
if (isDestroyed) {
RIBs.errorHandler.handleNonFatalError(
"Calling onPause when Node has been destroyed. $this",
RuntimeException("Calling onPause when Node has been destroyed. $this")
)
return
}

lifecycleManager.onPauseExternal()
plugins.filterIsInstance<AndroidLifecycleAware>().forEach { it.onPause() }
}
Expand Down