[PR #4920] [MERGED] PM-19498: Update cipher migration logic #5314

Closed
opened 2025-11-26 23:57:47 -06:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4920
Author: @david-livefront
Created: 3/26/2025
Status: Merged
Merged: 3/26/2025
Merged by: @david-livefront

Base: mainHead: PM-19498-cipher-migration-bug


📝 Commits (1)

  • 4144995 PM-19498: Update cipher migration logic

📊 Changes

2 files changed (+33 additions, -21 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/data/vault/manager/CipherManagerImpl.kt (+27 -21)
📝 app/src/test/java/com/x8bit/bitwarden/data/vault/manager/CipherManagerTest.kt (+6 -0)

📄 Description

🎟️ Tracking

PM-19498

📔 Objective

This PR updates migration logic to ensure the migration only occurs when the SDK actually generate a key for the cipher. If the SDK feature for generating a key is disabled, the cipher update API seems to fail; this failure does not occur when the key is present.

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/4920 **Author:** [@david-livefront](https://github.com/david-livefront) **Created:** 3/26/2025 **Status:** ✅ Merged **Merged:** 3/26/2025 **Merged by:** [@david-livefront](https://github.com/david-livefront) **Base:** `main` ← **Head:** `PM-19498-cipher-migration-bug` --- ### 📝 Commits (1) - [`4144995`](https://github.com/bitwarden/android/commit/414499502edf6fdd9a8a88dbcf7052b72d7b91bc) PM-19498: Update cipher migration logic ### 📊 Changes **2 files changed** (+33 additions, -21 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/data/vault/manager/CipherManagerImpl.kt` (+27 -21) 📝 `app/src/test/java/com/x8bit/bitwarden/data/vault/manager/CipherManagerTest.kt` (+6 -0) </details> ### 📄 Description ## 🎟️ Tracking [PM-19498](https://bitwarden.atlassian.net/browse/PM-19498) ## 📔 Objective This PR updates migration logic to ensure the migration only occurs when the SDK actually generate a key for the cipher. If the SDK feature for generating a key is disabled, the cipher update API seems to fail; this failure does not occur when the key is present. ## ⏰ 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 [PM-19498]: https://bitwarden.atlassian.net/browse/PM-19498?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:57:47 -06:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#5314