Fix session-scoped injection and database migration issues#6230
Merged
SeniorZhai merged 2 commits intofeature/session-scope-injection-migrationfrom Mar 18, 2026
Merged
Fix session-scoped injection and database migration issues#6230SeniorZhai merged 2 commits intofeature/session-scope-injection-migrationfrom
SeniorZhai merged 2 commits intofeature/session-scope-injection-migrationfrom
Conversation
Address critical issues identified in PR review: - Fix SafeBoxStoreManager memory leak by tracking and cleaning up coroutine scopes - Fix PendingDatabaseImp to properly clear supportSQLiteDatabase on scope changes - Fix AccountSessionInitializer to migrate databases BEFORE clearing jobs/raw transactions - Fix BaseDbModule to use Provider for session-scoped DB bindings to defer resolution - Fix Injector to defer session-scoped injection until session is available - Fix AccountSessionInitializer to preserve settings on same-user re-login - Fix DatabaseUtil to avoid creating empty scoped DB files prematurely - Remove unused import and errorMessage observation in SetPinLoadingPage Co-authored-by: crossle <1675131+crossle@users.noreply.github.com>
Contributor
Author
|
Just as a heads up, I was blocked by some firewall rules while working on your feedback. Expand below for details. Warning Firewall rules blocked me from connecting to one or more addresses (expand for details)I tried to connect to the following addresses, but was blocked by firewall rules:
If you need me to access, download, or install something from one of these locations, you can either:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Addresses critical session-scoped dependency injection and database migration ordering issues that cause crashes on startup/logout and potential data loss.
Session-scoped dependency injection
Problem: Components requesting session-scoped databases (MixinDatabase, WalletDatabase, PendingDatabase, FtsDatabase) crash when
Session.getAccount()is null (first launch, logout, background start).Solution:
BaseDbModulenow usesProvider<CurrentUserScopeManager>to defer database resolution until actually neededInjectorinit block checks for active session before attempting injection, falls back toensureSessionInjection()when session is availableDatabase migration ordering
Problem:
AccountSessionInitializercalledclearJobsAndRawTransaction()beforeCurrentUserScopeManager.enter(), which created empty scoped DB files before legacy-to-scoped migration ran. Migration then skipped moving legacy data (target exists), orphaning the real database.Solution: Reordered to enter scope (triggers migration) before any database operations:
Removed premature
MixinDatabase.getDatabase()call inclearJobsAndRawTransaction()that could create empty DB files.Resource leaks
clearCurrent()/clearAll()methods to cancel scopes on logout/account switch.supportSQLiteDatabasereference retained closed database connections across scope changes. Now cleared when closing or switching identities.Same-user re-login
AccountSessionInitializernow checks if logging into the same account and preserves SharedPreferences/CryptoWallet settings on re-login, only clearing on account switch.