Skip to content

Fix #2075: Fix ViewModel not clearing on NavigationState pop (nav3)#2079

Open
ArpitDhoundiyal wants to merge 4 commits intoandroid:mainfrom
ArpitDhoundiyal:fix/viewmodel-oncleared
Open

Fix #2075: Fix ViewModel not clearing on NavigationState pop (nav3)#2079
ArpitDhoundiyal wants to merge 4 commits intoandroid:mainfrom
ArpitDhoundiyal:fix/viewmodel-oncleared

Conversation

@ArpitDhoundiyal
Copy link

This PR fixes issue [#2075]
where ViewModel.onCleared() was not being called when a screen was popped from the navigation stack, and only triggered when the app was fully closed.

Previously, with nav3 NavigationState, ViewModel.onCleared()
was not being triggered when a NavEntry was removed from the stack.

This was happening because ViewModelStore was not being cleared on pop.
Added rememberViewModelStoreNavEntryDecorator with
removeViewModelStoreOnPop = { true } to ensure that
ViewModelStore is cleared when the entry is removed.

Verified via logs that onCleared() is now properly invoked
when navigating away from the screen.

@ArpitDhoundiyal ArpitDhoundiyal requested a review from dturner as a code owner March 2, 2026 11:24
@gemini-code-assist
Copy link

Summary of Changes

Hello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses a critical memory management issue within the navigation system by ensuring that ViewModel.onCleared() is reliably invoked when a screen is removed from the navigation stack. This prevents potential resource leaks and improves the overall stability and resource utilization of the application. The fix involves a specific configuration change to the navigation state decorators, alongside routine dependency updates.

Highlights

  • ViewModel Lifecycle Fix: Resolved an issue where ViewModel.onCleared() was not being called when a screen was popped from the navigation stack, leading to potential memory leaks.
  • Navigation State Configuration: Configured rememberViewModelStoreNavEntryDecorator with removeViewModelStoreOnPop = { true } to ensure the ViewModelStore is properly cleared upon navigation entry removal.
  • Dependency Updates: Updated the Android Gradle Plugin and Android Tools versions to 9.0.1 and 32.0.1 respectively.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Changelog
  • core/navigation/src/main/kotlin/com/google/samples/apps/nowinandroid/core/navigation/NavigationState.kt
    • Enabled removeViewModelStoreOnPop for rememberViewModelStoreNavEntryDecorator to ensure ViewModelStore clearing on navigation pop.
  • feature/topic/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/impl/TopicViewModel.kt
    • Added an unused android.util.Log import.
    • Introduced minor whitespace changes.
  • gradle/libs.versions.toml
    • Upgraded androidGradlePlugin from 9.0.0 to 9.0.1.
    • Upgraded androidTools from 32.0.0 to 32.0.1.
Activity
  • No human activity (comments, reviews, etc.) has been recorded for this pull request yet.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request correctly addresses an issue where ViewModels were not being cleared when a screen was popped from the navigation stack. The fix, which involves setting removeViewModelStoreOnPop = { true } in rememberViewModelStoreNavEntryDecorator, is appropriate and directly solves the problem described. The PR also includes some dependency updates and formatting changes. I've identified one minor issue regarding an unused import that should be removed.


package com.google.samples.apps.nowinandroid.feature.topic.impl

import android.util.Log

Choose a reason for hiding this comment

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

medium

This Log import is unused within the file and should be removed to maintain code cleanliness. It was likely added for debugging during development and is no longer needed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant