Feature/session scope injection migration by SeniorZhai · Pull Request #6190 · MixinNetwork/android-app

SeniorZhai · 2026-03-08T15:22:00Z

No description provided.

…ons after MixinDatabase validation

…pe-injection-migration

…njection

…pe-injection-migration # Conflicts: # app/src/main/java/one/mixin/android/ui/landing/MnemonicPhraseFragment.kt

…njection-migration

Copilot

Pull request overview

This PR migrates app storage and DI to a session/user-scoped database model (keyed by identityNumber) and updates a wide set of call sites to use the new scoped access patterns. It also refactors parts of the landing/login flow into a new LandingViewModel/LandingAccountRepository split, and adds logout UI wiring.

Changes:

Introduce CurrentUserScopeManager to manage per-account scoped DB instances (Mixin/Wallet/Pending/FTS) and update services/jobs/repositories to use it.
Migrate database file layout to per-identity directories and add legacy-to-scoped file migration utilities; update backup/restore paths accordingly.
Refactor landing/login flow (new LandingViewModel, slimmer MobileViewModel) and add an Account “Log out” row + logic.

Reviewed changes

Copilot reviewed 58 out of 58 changed files in this pull request and generated 13 comments.

Show a summary per file

File	Description
app/src/main/res/layout/fragment_account.xml	Adds “Log out” row to account settings UI.
app/src/main/java/one/mixin/android/websocket/ChatWebSocket.kt	Switches DB access to `CurrentUserScopeManager`.
app/src/main/java/one/mixin/android/webrtc/CallService.kt	Uses scoped DB via `CurrentUserScopeManager`.
app/src/main/java/one/mixin/android/util/database/DatabaseUtil.kt	Reworks DB file paths + legacy migration helpers; changes clearing logic to identity-scoped.
app/src/main/java/one/mixin/android/util/backup/Backup.kt	Backup/restore now resolves legacy vs scoped DB files.
app/src/main/java/one/mixin/android/util/AudioPlayer.kt	Uses identity-scoped `MixinDatabase.getDatabase(...)`.
app/src/main/java/one/mixin/android/ui/wallet/fiatmoney/RouteAPI.kt	Writes participant session into identity-scoped DB.
app/src/main/java/one/mixin/android/ui/transfer/TransferActivity.kt	Uses identity-scoped DB for participant lookup.
app/src/main/java/one/mixin/android/ui/setting/ui/page/MnemonicPhraseBackupVerifyPage.kt	Injects `WalletViewModel` into compose page; passes TIP helpers through.
app/src/main/java/one/mixin/android/ui/setting/VerificationEmergencyFragment.kt	Ensures current user scope is entered after account store.
app/src/main/java/one/mixin/android/ui/setting/DatabaseDebugFragment.kt	Ensures scope from session before opening wallet DB.
app/src/main/java/one/mixin/android/ui/setting/AccountFragment.kt	Adds logout click handling and mnemonic-backup warning gating.
app/src/main/java/one/mixin/android/ui/search/holder/TipHolder.kt	Tweaks placeholder formatting/spacing.
app/src/main/java/one/mixin/android/ui/player/MusicService.kt	Uses scoped DB via `CurrentUserScopeManager`.
app/src/main/java/one/mixin/android/ui/oldwallet/AssetRepository.kt	Removes `@Singleton` (scope behavior change).
app/src/main/java/one/mixin/android/ui/landing/components/SetPinLoadingPage.kt	Displays detailed TIP step status during PIN setup.
app/src/main/java/one/mixin/android/ui/landing/components/MnemonicPhrasePage.kt	Migrates to `LandingViewModel`.
app/src/main/java/one/mixin/android/ui/landing/components/MnemonicPhraseInput.kt	Decouples TIP export from `WalletViewModel` by passing suspend lambdas.
app/src/main/java/one/mixin/android/ui/landing/VerificationFragment.kt	Switches to `LandingViewModel`; uses `Provider<UserRepository>` for session-aware usage.
app/src/main/java/one/mixin/android/ui/landing/UpgradeFragment.kt	Removes unused `MobileViewModel` binding.
app/src/main/java/one/mixin/android/ui/landing/SetupPinViewModel.kt	Adds `tipStep` LiveData and posts step changes.
app/src/main/java/one/mixin/android/ui/landing/RestoreFragment.kt	Resolves legacy vs scoped DB file for local data info.
app/src/main/java/one/mixin/android/ui/landing/MobileViewModel.kt	Slimmed; shifts responsibilities out to landing-specific view model/repositories.
app/src/main/java/one/mixin/android/ui/landing/MobileFragment.kt	Uses `LandingViewModel` for verification flow.
app/src/main/java/one/mixin/android/ui/landing/MnemonicPhraseFragment.kt	Uses `LandingViewModel` and new session initializer for session setup.
app/src/main/java/one/mixin/android/ui/landing/LocalRestoreFragment.kt	Adds more defensive error handling around restore operations.
app/src/main/java/one/mixin/android/ui/landing/LandingViewModel.kt	New view model for landing/login flows.
app/src/main/java/one/mixin/android/ui/home/MainActivity.kt	Triggers migration on start; converts multiple injected deps to Providers; version check uses scoped DB file.
app/src/main/java/one/mixin/android/ui/common/PinCodeFragment.kt	Replaces inline session setup with `initializeAccountSession(...)`.
app/src/main/java/one/mixin/android/session/CurrentUserScopeManager.kt	New session-scope manager for DB instances.
app/src/main/java/one/mixin/android/session/AccountSessionInitializer.kt	New helper to initialize session and scope.
app/src/main/java/one/mixin/android/repository/Web3Repository.kt	Removes `@Singleton` (scope behavior change).
app/src/main/java/one/mixin/android/repository/UserRepository.kt	Removes `@Singleton` (scope behavior change).
app/src/main/java/one/mixin/android/repository/TokenRepository.kt	Moves SafeBox persistence to `SafeBoxStoreManager`.
app/src/main/java/one/mixin/android/repository/SafeBoxStoreManager.kt	New per-account DataStore manager for SafeBox.
app/src/main/java/one/mixin/android/repository/MemberRepository.kt	Removes `@Singleton` (scope behavior change).
app/src/main/java/one/mixin/android/repository/LandingAccountRepository.kt	New repository wrapper for landing flows (no DB dependency).
app/src/main/java/one/mixin/android/repository/ConversationRepository.kt	Updates conversation observation to use identity-scoped DB; removes unused create() overload.
app/src/main/java/one/mixin/android/repository/AccountRepository.kt	Removes `@Singleton` (scope behavior change).
app/src/main/java/one/mixin/android/messenger/HedwigImp.kt	Uses `CurrentUserScopeManager` and guards DB observers across scope changes.
app/src/main/java/one/mixin/android/job/RefreshAccountJob.kt	Uses identity-scoped DB for account updates.
app/src/main/java/one/mixin/android/job/NotificationGenerator.kt	Ensures session injection before generating notifications.
app/src/main/java/one/mixin/android/job/Injector.kt	Adds session re-injection mechanism keyed by scope version.
app/src/main/java/one/mixin/android/job/DecryptMessage.kt	Calls `ensureSessionInjection()` before DB operations.
app/src/main/java/one/mixin/android/job/DecryptCallMessage.kt	Calls `ensureSessionInjection()` before DB operations.
app/src/main/java/one/mixin/android/job/ConvertVideoJob.kt	Removes static DB reference; uses injected/scoped DB.
app/src/main/java/one/mixin/android/job/BlazeMessageService.kt	Refactors to resolve DBs via `CurrentUserScopeManager`; fixes observer removal across scope swaps.
app/src/main/java/one/mixin/android/fts/FtsDatabase.kt	Makes FTS DB identity-scoped and closable/resettable.
app/src/main/java/one/mixin/android/extension/UrlExtension.kt	Uses identity-scoped DB for deep-link lookups; adds fallback behavior when not logged in.
app/src/main/java/one/mixin/android/di/BaseDbModule.kt	Provides DBs via `CurrentUserScopeManager` (session-scoped).
app/src/main/java/one/mixin/android/di/AppModule.kt	Updates `ChatWebSocket` provider; removes SafeBox DataStore provider.
app/src/main/java/one/mixin/android/db/property/Web3PropertyHelper.kt	Uses identity-scoped wallet DB.
app/src/main/java/one/mixin/android/db/property/PropertyHelper.kt	Uses identity-scoped mixin DB for property ops/migrations.
app/src/main/java/one/mixin/android/db/pending/PendingDatabaseImp.kt	Makes pending DB identity-scoped; adjusts lifecycle handling.
app/src/main/java/one/mixin/android/db/WalletDatabase.kt	Makes wallet DB identity-scoped; removes temp migration path.
app/src/main/java/one/mixin/android/db/MixinDatabase.kt	Makes mixin DB identity-scoped; adds legacy file migration and better destroy/close semantics.
app/src/main/java/one/mixin/android/db/DatabaseMonitor.kt	Avoids enabling DB monitor when session not ready.
app/src/main/java/one/mixin/android/MixinApplication.kt	Splits logout into clearer steps; exits scope on logout; scoped participant session clearing.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

app/src/main/java/one/mixin/android/repository/SafeBoxStoreManager.kt

+        private val stores = ConcurrentHashMap<String, DataStore<SafeBox>>()
+
+        fun current(): DataStore<SafeBox> {
+            val accountId = Session.getAccountId() ?: "temp"
+            return stores.getOrPut(accountId) {


app/src/main/java/one/mixin/android/job/Injector.kt

+        val scopeVersion = currentUserScopeManager.getScopeVersion()
+        if (scopeVersion == injectedScopeVersion) {
+            return
+        }
+        synchronized(this) {
+            val latestScopeVersion = currentUserScopeManager.getScopeVersion()
+            if (latestScopeVersion == injectedScopeVersion) {
+                return
+            }
+            injectSelf()
+        }
+    }
+
+    init {
+        injectSelf()


app/src/main/java/one/mixin/android/di/BaseDbModule.kt

    fun provideRatchetSenderKeyDao(db: SignalDatabase) = db.ratchetSenderKeyDao()
-
-    @Singleton
    @Provides
-    fun provideDb(app: Application) = MixinDatabase.getDatabase(app)
-
-    @Singleton
+    fun provideDb(scopeManager: CurrentUserScopeManager) = scopeManager.getMixinDatabase()
    @Provides
-    fun providePendingDatabase(
-        app: Application,
-        mixinDatabase: MixinDatabase,
-    ): PendingDatabase = PendingDatabaseImp.getDatabase(app.applicationContext, mixinDatabase.floodMessageDao(), mixinDatabase.jobDao())
-
-    @Singleton
+    fun providePendingDatabase(scopeManager: CurrentUserScopeManager): PendingDatabase = scopeManager.getPendingDatabase()


app/src/main/java/one/mixin/android/session/AccountSessionInitializer.kt

+    withContext(Dispatchers.IO) {
+        clearJobsAndRawTransaction(context, account.identityNumber)
+    }


app/src/main/java/one/mixin/android/db/pending/PendingDatabaseImp.kt

            synchronized(lock) {
+                if (INSTANCE != null && currentIdentityNumber != scopedIdentity) {
+                    INSTANCE?.close()
+                    INSTANCE = null


app/src/main/java/one/mixin/android/util/database/DatabaseUtil.kt

+        val scopedDbFile = databaseFile(context, identityNumber)
+        val legacyDbFile = legacyDatabaseFile(context)
+        if (!scopedDbFile.exists() && !legacyDbFile.exists()) {
            return
        }


app/src/main/java/one/mixin/android/util/database/DatabaseUtil.kt

            // Init database
-            MixinDatabase.getDatabase(context)
+            MixinDatabase.getDatabase(context, identityNumber)
            db = MixinDatabase.getWritableDatabase() ?: return


app/src/main/java/one/mixin/android/db/pending/PendingDatabaseImp.kt

+        super.close()
+        INSTANCE = null
+        currentIdentityNumber = null


app/src/main/java/one/mixin/android/ui/landing/components/SetPinLoadingPage.kt

 import one.mixin.android.extension.openUrl
+import one.mixin.android.extension.toast
 import one.mixin.android.ui.landing.SetupPinViewModel


app/src/main/java/one/mixin/android/ui/landing/components/SetPinLoadingPage.kt

    val setupState by viewModel.setupState.observeAsState(SetupState.Loading)
+    val tipStep by viewModel.tipStep.observeAsState(TryConnecting)
+    val errorMessage by viewModel.errorMessage.observeAsState("")
    val context = LocalContext.current


…pe-injection-migration # Conflicts: # app/src/main/java/one/mixin/android/ui/landing/LocalRestoreFragment.kt

crossle · 2026-03-17T12:54:12Z

@claude[agent] review

Claude · 2026-03-17T12:54:20Z

@crossle I've opened a new pull request, #6230, to work on those changes. Once the pull request is ready, I'll request review from you.

* Initial plan * Fix session-scoped injection and database migration issues 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> --------- Co-authored-by: anthropic-code-agent[bot] <242468646+Claude@users.noreply.github.com> Co-authored-by: crossle <1675131+crossle@users.noreply.github.com>

SeniorZhai added 3 commits March 6, 2026 13:10

refactor: apply session-scoped injection and unify related DB migrati…

f6e9786

…ons after MixinDatabase validation

refactor(db): require account identity for scoped database access

d0d0d11

Merge remote-tracking branch 'origin/master' into feature/session-sco…

98eb9bd

…pe-injection-migration

SeniorZhai added the testing Now testing, but you can review label Mar 8, 2026

refactor(debug): align DatabaseDebugFragment with session-scoped DB i…

166e0c6

…njection

SeniorZhai force-pushed the feature/session-scope-injection-migration branch 2 times, most recently from 3e1e78b to 2b0d984 Compare March 10, 2026 04:52

refactor: reuse account session initialization for login and signup

f38b27f

SeniorZhai force-pushed the feature/session-scope-injection-migration branch from 2b0d984 to f38b27f Compare March 10, 2026 05:29

SeniorZhai added 3 commits March 10, 2026 14:15

Lazy provider

e9bcf96

Fix database upgrade

917a996

Merge remote-tracking branch 'origin/master' into feature/session-sco…

4748203

…pe-injection-migration # Conflicts: # app/src/main/java/one/mixin/android/ui/landing/MnemonicPhraseFragment.kt

SeniorZhai force-pushed the feature/session-scope-injection-migration branch from 8a33f79 to 4748203 Compare March 12, 2026 04:01

SeniorZhai added 3 commits March 12, 2026 13:47

refactor: split logout cleanup and clear biometric state

4526133

fix: expose set pin error message

23990e3

Merge branch 'ix/set-pin-error-handling' into feature/session-scope-i…

a36f5d2

…njection-migration

SeniorZhai marked this pull request as ready for review March 13, 2026 02:41

SeniorZhai requested a review from Copilot March 13, 2026 02:41

Copilot started reviewing on behalf of SeniorZhai March 13, 2026 02:41 View session

Copilot AI reviewed Mar 13, 2026

View reviewed changes

SeniorZhai and others added 4 commits March 13, 2026 11:37

fix: cancel jobs on missing account scope during restore

56c8b20

Merge remote-tracking branch 'origin/master' into feature/session-sco…

35554eb

…pe-injection-migration # Conflicts: # app/src/main/java/one/mixin/android/ui/landing/LocalRestoreFragment.kt

Merge branch 'master' into feature/session-scope-injection-migration

68e3ef0

Merge branch 'master' into feature/session-scope-injection-migration

0a682db

Claude AI mentioned this pull request Mar 17, 2026

Fix session-scoped injection and database migration issues #6230

Merged

Claude AI and others added 3 commits March 18, 2026 09:54

Clear any sensitive data

407b8de

Ensure scope

ebeb12f

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/session scope injection migration#6190

Feature/session scope injection migration#6190
SeniorZhai wants to merge 18 commits intomasterfrom
feature/session-scope-injection-migration

SeniorZhai commented Mar 8, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

crossle commented Mar 17, 2026

Uh oh!

Claude AI commented Mar 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

SeniorZhai commented Mar 8, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

crossle commented Mar 17, 2026

Uh oh!

Claude AI commented Mar 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants