github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-03-22 06:11:38 -05:00
Code Issues 144 Packages Projects Releases 116 Wiki Activity

[PR #4373] [MERGED] PM-15177: Improve destructive fallback logic #4903

New Issue
Closed
opened 2025-11-26 23:51:19 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-26 23:51:19 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4373
Author: @david-livefront
Created: 11/22/2024
Status: ✅ Merged
Merged: 11/22/2024
Merged by: @david-livefront

Base: main ← Head: PM-15177-improved-destructive-fallback-main

📝 Commits (1)

  • 0efd95e PM-15177: Improve destructive fallback logic

📊 Changes

11 files changed (+102 additions, -240 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/di/PlatformDiskModule.kt (+1 -8)
📝 app/src/main/java/com/x8bit/bitwarden/data/platform/manager/DatabaseSchemeManager.kt (+4 -9)
📝 app/src/main/java/com/x8bit/bitwarden/data/platform/manager/DatabaseSchemeManagerImpl.kt (+13 -20)
📝 app/src/main/java/com/x8bit/bitwarden/data/platform/manager/di/PlatformManagerModule.kt (+2 -2)
📝 app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/di/GeneratorDiskModule.kt (+1 -8)
📝 app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/callback/DatabaseSchemeCallback.kt (+1 -3)
📝 app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/di/VaultDiskModule.kt (+1 -3)
📝 app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt (+30 -38)
📝 app/src/test/java/com/x8bit/bitwarden/data/platform/manager/DatabaseSchemeManagerTest.kt (+37 -49)
📝 app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/disk/callback/DatabaseSchemeCallbackTest.kt (+4 -13)
📝 app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt (+8 -87)

📄 Description

🎟️ Tracking

PM-15177

📔 Objective

This is cherry-picked from the release branch.

This PR update the logic for managing a destructive fallback. The big difference is that we clear the lasSyncTime for all users to ensure that vault gets re-synced.

⏰ Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation 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/4373 **Author:** [@david-livefront](https://github.com/david-livefront) **Created:** 11/22/2024 **Status:** ✅ Merged **Merged:** 11/22/2024 **Merged by:** [@david-livefront](https://github.com/david-livefront) **Base:** `main` ← **Head:** `PM-15177-improved-destructive-fallback-main` --- ### 📝 Commits (1) - [`0efd95e`](https://github.com/bitwarden/android/commit/0efd95efde9de6342d3a2f4e3b3c5a6388d6f7e6) PM-15177: Improve destructive fallback logic ### 📊 Changes **11 files changed** (+102 additions, -240 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/di/PlatformDiskModule.kt` (+1 -8) 📝 `app/src/main/java/com/x8bit/bitwarden/data/platform/manager/DatabaseSchemeManager.kt` (+4 -9) 📝 `app/src/main/java/com/x8bit/bitwarden/data/platform/manager/DatabaseSchemeManagerImpl.kt` (+13 -20) 📝 `app/src/main/java/com/x8bit/bitwarden/data/platform/manager/di/PlatformManagerModule.kt` (+2 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/di/GeneratorDiskModule.kt` (+1 -8) 📝 `app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/callback/DatabaseSchemeCallback.kt` (+1 -3) 📝 `app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/di/VaultDiskModule.kt` (+1 -3) 📝 `app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt` (+30 -38) 📝 `app/src/test/java/com/x8bit/bitwarden/data/platform/manager/DatabaseSchemeManagerTest.kt` (+37 -49) 📝 `app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/disk/callback/DatabaseSchemeCallbackTest.kt` (+4 -13) 📝 `app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt` (+8 -87) </details> ### 📄 Description ## 🎟️ Tracking [PM-15177](https://bitwarden.atlassian.net/browse/PM-15177) ## 📔 Objective This is cherry-picked from the release branch. This PR update the logic for managing a destructive fallback. The big difference is that we clear the `lasSyncTime` for all users to ensure that vault gets re-synced. ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation 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 [PM-15177]: https://bitwarden.atlassian.net/browse/PM-15177?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ --- <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 2025-11-26 23:51:19 -06: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#4903
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?