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

Fix for reuse fragment scope #1101

Merged
merged 1 commit into from
Jun 10, 2021
Merged

Fix for reuse fragment scope #1101

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
16 changes: 13 additions & 3 deletions android/koin-android/src/main/java/org/koin/androidx/scope/LifecycleScopeDelegate.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import kotlin.reflect.KProperty

class LifecycleScopeDelegate(
val lifecycleOwner: LifecycleOwner,
koinContext: KoinContext = GlobalContext,
createScope: (Koin) -> Scope = { koin: Koin -> koin.createScope(lifecycleOwner.getScopeId(), lifecycleOwner.getScopeName()) },
private val koinContext: KoinContext = GlobalContext,
private val createScope: (Koin) -> Scope = { koin: Koin -> koin.createScope(lifecycleOwner.getScopeId(), lifecycleOwner.getScopeName()) },
) : ReadOnlyProperty<LifecycleOwner, Scope> {

private var _scope: Scope? = null
Expand All @@ -43,6 +43,16 @@ class LifecycleScopeDelegate(
}

override fun getValue(thisRef: LifecycleOwner, property: KProperty<*>): Scope {
return _scope ?: error("can't get Scope for $lifecycleOwner")
if (_scope != null) return _scope!!

val ownerState = thisRef.lifecycle.currentState
val ownerIsActive = ownerState.isAtLeast(Lifecycle.State.CREATED)
if (!ownerIsActive) {
error("can't get Scope for $lifecycleOwner")
}

val koin = koinContext.get()
_scope = koin.getScopeOrNull(thisRef.getScopeId()) ?: createScope(koin)
return _scope!!
}
}