github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-05-06 07:48:22 -05:00
Code Issues 1.1k Packages Projects Releases 122 Wiki Activity

[PR #5871] [MERGED] Refactor Vault Sync Logic into VaultSyncManager #18863

New Issue
Closed
opened 2026-04-15 03:32:30 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-15 03:32:30 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/5871
Author: @SaintPatrck
Created: 9/11/2025
Status: ✅ Merged
Merged: 9/16/2025
Merged by: @SaintPatrck

Base: main ← Head: extact-vault-sync-manager

📝 Commits (3)

  • 87934c7 Refactor Vault Sync Logic into VaultSyncManager
  • b4be87a Address review comments
  • b1d762b Correct syncInternal formatting

📊 Changes

12 files changed (+677 additions, -561 deletions)

View changed files

➕ app/src/main/kotlin/com/x8bit/bitwarden/data/platform/error/SecurityStampMismatchException.kt (+6 -0)
➕ app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultSyncManager.kt (+29 -0)
➕ app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultSyncManagerImpl.kt (+176 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/di/VaultManagerModule.kt (+24 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/model/SyncVaultDataResult.kt (+3 -3)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt (+1 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt (+13 -149)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/di/VaultRepositoryModule.kt (+3 -6)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsViewModel.kt (+1 -1)
➕ app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultSyncManagerTest.kt (+291 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt (+129 -400)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsViewModelTest.kt (+1 -1)

📄 Description

🎟️ Tracking

TBD

📔 Objective

This change introduces VaultSyncManager to encapsulate the vault synchronization logic previously handled within VaultRepositoryImpl.

Key changes:

  • Created VaultSyncManager interface and VaultSyncManagerImpl implementation.
  • Moved sync-related logic, including security stamp checks, organization crypto initialization, and data storage, from VaultRepositoryImpl to VaultSyncManagerImpl.
  • VaultRepositoryImpl now delegates sync operations to VaultSyncManager.
  • Introduced SecurityStampMismatchException for clearer error handling.
  • Moved SyncVaultDataResult to com.x8bit.bitwarden.data.vault.manager.model.
  • Updated DI modules and tests to reflect these changes.

⏰ Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Protected functional changes with optionality (feature flags)
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • ❓ (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • ❌ (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/bitwarden/android/pull/5871 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 9/11/2025 **Status:** ✅ Merged **Merged:** 9/16/2025 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `extact-vault-sync-manager` --- ### 📝 Commits (3) - [`87934c7`](https://github.com/bitwarden/android/commit/87934c707003774d3f241e3272320f72c32de45c) Refactor Vault Sync Logic into VaultSyncManager - [`b4be87a`](https://github.com/bitwarden/android/commit/b4be87a961cd82a3d1e9cd651810ad6e6599654e) Address review comments - [`b1d762b`](https://github.com/bitwarden/android/commit/b1d762b4266af118066b46ed8fb2126d1143aa84) Correct syncInternal formatting ### 📊 Changes **12 files changed** (+677 additions, -561 deletions) <details> <summary>View changed files</summary> ➕ `app/src/main/kotlin/com/x8bit/bitwarden/data/platform/error/SecurityStampMismatchException.kt` (+6 -0) ➕ `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultSyncManager.kt` (+29 -0) ➕ `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultSyncManagerImpl.kt` (+176 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/di/VaultManagerModule.kt` (+24 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/model/SyncVaultDataResult.kt` (+3 -3) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt` (+1 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt` (+13 -149) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/di/VaultRepositoryModule.kt` (+3 -6) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsViewModel.kt` (+1 -1) ➕ `app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultSyncManagerTest.kt` (+291 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt` (+129 -400) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsViewModelTest.kt` (+1 -1) </details> ### 📄 Description ## 🎟️ Tracking TBD ## 📔 Objective This change introduces `VaultSyncManager` to encapsulate the vault synchronization logic previously handled within `VaultRepositoryImpl`. Key changes: - Created `VaultSyncManager` interface and `VaultSyncManagerImpl` implementation. - Moved sync-related logic, including security stamp checks, organization crypto initialization, and data storage, from `VaultRepositoryImpl` to `VaultSyncManagerImpl`. - `VaultRepositoryImpl` now delegates sync operations to `VaultSyncManager`. - Introduced `SecurityStampMismatchException` for clearer error handling. - Moved `SyncVaultDataResult` to `com.x8bit.bitwarden.data.vault.manager.model`. - Updated DI modules and tests to reflect these changes. ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Protected functional changes with optionality (feature flags) - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team ## 🦮 Reviewer guidelines <!-- Suggested interactions but feel free to use (or not) as you desire! --> - 👍 (`:+1:`) or similar for great changes - 📝 (`:memo:`) or ℹ️ (`:information_source:`) for notes or general info - ❓ (`:question:`) for questions - 🤔 (`:thinking:`) or 💭 (`:thought_balloon:`) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion - 🎨 (`:art:`) for suggestions / improvements - ❌ (`:x:`) or ⚠️ (`:warning:`) for more significant problems or concerns needing attention - 🌱 (`:seedling:`) or ♻️ (`:recycle:`) for future improvements or indications of technical debt - ⛏ (`:pick:`) for minor or nitpick changes --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-15 03:32:31 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
app:authenticator
app:password-manager
bug
bug-passkey
customer-support
duplicate
enhancement
good first issue
help wanted
needs-reply
needs-response
pull-request
Mirrored from GitHub Pull Request
 question
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#18863
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?