Fix Activity Retained Scope id + attached fragment

InsertKoinIO · Nov 28, 2024 · df15529 · df15529
1 parent d009593
commit df15529
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 17 deletions.
diff --git a/examples/androidx-samples/src/main/java/org/koin/sample/sandbox/scope/ScopedActivityA.kt b/examples/androidx-samples/src/main/java/org/koin/sample/sandbox/scope/ScopedActivityA.kt
@@ -22,16 +22,15 @@ class ScopedActivityA : RetainedScopeActivity(R.layout.scoped_activity_a) {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        supportFragmentManager.beginTransaction()
-            .replace<ScopedFragment>(R.id.mvvm_frame)
-            .commit()
-
         assert(currentSession == get<Session>())
-        if (SESSION_ID_VAR.isEmpty()) {
+        if (SESSION_ID_VAR.isEmpty() || SESSION_ID_VAR.first() == "") {
+            if (SESSION_ID_VAR.isNotEmpty()){
+                SESSION_ID_VAR.removeFirst()
+            }
             println("Create ID for session: $SESSION_ID_VAR")
-            SESSION_ID_VAR = currentSession.id
+            SESSION_ID_VAR.addFirst(currentSession.id)
         }
-        assert(SESSION_ID_VAR == currentSession.id)
+        assert(SESSION_ID_VAR.first() == currentSession.id)
 
         // Conpare different scope instances
         val scopeSession1 = getKoin().createScope(SESSION_1, named(SCOPE_ID))
@@ -52,6 +51,11 @@ class ScopedActivityA : RetainedScopeActivity(R.layout.scoped_activity_a) {
 
         title = "Scope Activity A"
 
+        findViewById<Button>(R.id.scoped_a_restart_button).setOnClickListener {
+            SESSION_ID_VAR.addFirst("")
+            navigateTo<ScopedActivityA>(isRoot = false)
+        }
+
         findViewById<Button>(R.id.scoped_a_button).setOnClickListener {
             navigateTo<ScopedActivityB>(isRoot = true)
         }
@@ -60,7 +64,13 @@ class ScopedActivityA : RetainedScopeActivity(R.layout.scoped_activity_a) {
         scopeSession2.close()
     }
 
+    override fun onBackPressed() {
+        super.onBackPressed()
+
+        SESSION_ID_VAR.removeFirst()
+    }
+
     companion object {
-        var SESSION_ID_VAR = ""
+        var SESSION_ID_VAR = ArrayDeque<String>()
     }
 }
diff --git a/examples/androidx-samples/src/main/java/org/koin/sample/sandbox/scope/ScopedFragment.kt b/examples/androidx-samples/src/main/java/org/koin/sample/sandbox/scope/ScopedFragment.kt
@@ -5,7 +5,6 @@ import android.view.View
 import androidx.fragment.app.Fragment
 import org.koin.android.scope.AndroidScopeComponent
 import org.koin.androidx.scope.fragmentScope
-import org.koin.androidx.scope.getRetainedScopeOrNull
 import org.koin.core.scope.Scope
 import org.koin.sample.sandbox.R
 import org.koin.sample.sandbox.components.scope.Session
@@ -22,7 +21,7 @@ class ScopedFragment : Fragment(R.layout.mvvm_fragment), AndroidScopeComponent {
 
     private fun checks() {
         assert(
-            scope.get<Session>() == requireActivity().getRetainedScopeOrNull()?.get<Session>()
+            scope.get<Session>() == (requireActivity() as AndroidScopeComponent).scope.get<Session>()
         )
     }
 }
diff --git a/examples/androidx-samples/src/main/res/layout/scoped_activity_a.xml b/examples/androidx-samples/src/main/res/layout/scoped_activity_a.xml
@@ -12,6 +12,12 @@
         android:gravity="center"
         android:text="Scoped A completed!" />
 
+    <Button
+        android:id="@+id/scoped_a_restart_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Restart" />
+
     <Button
         android:id="@+id/scoped_a_button"
         android:layout_width="wrap_content"

diff --git a/projects/android/koin-android/src/main/java/org/koin/androidx/scope/ComponentActivityExt.kt b/projects/android/koin-android/src/main/java/org/koin/androidx/scope/ComponentActivityExt.kt
@@ -88,11 +88,8 @@ fun ComponentActivity.createActivityRetainedScope(): Scope {
 
     val scopeViewModel = viewModels<ScopeHandlerViewModel>().value
     if (scopeViewModel.scope == null) {
-        val scope = getKoin().createScope(retainedScopeId(), getScopeName())
+        val scope = getKoin().createScope(getScopeId(), getScopeName())
         scopeViewModel.scope = scope
     }
     return scopeViewModel.scope!!
-}
-
-fun ComponentActivity.retainedScopeId() : String = this::class.getFullName()
-fun ComponentActivity.getRetainedScopeOrNull(): Scope? = getKoin().getScopeOrNull(retainedScopeId())
+}
diff --git a/projects/android/koin-android/src/main/java/org/koin/androidx/scope/FragmentExt.kt b/projects/android/koin-android/src/main/java/org/koin/androidx/scope/FragmentExt.kt
@@ -32,11 +32,11 @@ fun Fragment.createFragmentScope(useParentActivityScope : Boolean = true): Scope
     }
     val scope = getKoin().getScopeOrNull(getScopeId()) ?: createScopeForCurrentLifecycle(this)
     if (useParentActivityScope){
-        val activityScope = requireActivity().getScopeOrNull() ?: requireActivity().getRetainedScopeOrNull()
+        val activityScope: Scope? = (activity as? AndroidScopeComponent)?.scope
         if (activityScope != null) {
             scope.linkTo(activityScope)
         } else {
-            scope.logger.debug("Fragment '$this' can't be linked to parent activity scope. No Parent Scope found.")
+            scope.logger.debug("Fragment '$this' can't be linked to parent activity scope. No Parent Activity Scope found.")
         }
     }
     return scope