Clear also keys when cleaning up a Container

sebaslogen · Aug 20, 2024 · e8747e1 · e8747e1
1 parent cc4f03e
commit e8747e1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/resaca/src/commonMain/kotlin/com/sebaslogen/resaca/ScopedViewModelContainer.kt b/resaca/src/commonMain/kotlin/com/sebaslogen/resaca/ScopedViewModelContainer.kt
@@ -358,6 +358,7 @@ public class ScopedViewModelContainer : ViewModel(), LifecycleEventObserver {
             val lastObject = objectsToClear.removeLast()
             clearLastDisposedObject(lastObject, objectsToClear)
         }
+        scopedObjectKeys.clear() // Clear all keys
         scopedObjectsContainer.clear() // Clear just in case this VM is leaked
         super.onCleared()
     }

diff --git a/sample/src/main/java/com/sebaslogen/resacaapp/sample/ui/main/data/FakeScopedViewModel.kt b/sample/src/main/java/com/sebaslogen/resacaapp/sample/ui/main/data/FakeScopedViewModel.kt
@@ -3,6 +3,7 @@ package com.sebaslogen.resacaapp.sample.ui.main.data
 import android.os.Bundle
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
+import com.sebaslogen.resacaapp.sample.ui.main.compose.objectToShortStringWithoutPackageName
 import com.sebaslogen.resacaapp.sample.ui.main.data.FakeScopedViewModel.Companion.MY_ARGS_KEY
 import com.sebaslogen.resacaapp.sample.viewModelsClearedGloballySharedCounter
 import java.util.concurrent.atomic.AtomicInteger
@@ -26,6 +27,11 @@ class FakeScopedViewModel(private val stateSaver: SavedStateHandle) : ViewModel(
      */
     private val viewModelsClearedCounter: AtomicInteger = viewModelsClearedGloballySharedCounter
 
+    /**
+     * Memory address of the ViewModel instance to debug name on the screen
+     */
+    val memoryAddress: String = objectToShortStringWithoutPackageName(this).replaceBeforeLast("@", "")
+
     override fun onCleared() {
         viewModelsClearedCounter.incrementAndGet()
         super.onCleared()