[PR #6132] [MERGED] 🍒 [PM-27806] Reverted changes to order of StorePolicies after sync #12487

Closed
opened 2026-04-11 03:44:02 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/6132
Author: @aj-rosado
Created: 11/6/2025
Status: Merged
Merged: 11/6/2025
Merged by: @aj-rosado

Base: release/2025.10-rc38Head: cp-pm-27806-respect-mp-policy


📝 Commits (1)

  • 3c3d674 [PM-27806] Reverted changes to order of StorePolicies after sync (#6130)

📊 Changes

3 files changed (+47 additions, -33 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultSyncManagerImpl.kt (+37 -33)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/di/VaultManagerModule.kt (+3 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultSyncManagerTest.kt (+7 -0)

📄 Description

🎟️ Tracking

PM-27806
Cherry-picked from https://github.com/bitwarden/android/pull/6130

📔 Objective

Reverted changes on the order when calling the storePolicies after the sync so that the flow properly navigates to update the master password.

It had been changed in order to have the most recent policies when setting the UserState.

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/6132 **Author:** [@aj-rosado](https://github.com/aj-rosado) **Created:** 11/6/2025 **Status:** ✅ Merged **Merged:** 11/6/2025 **Merged by:** [@aj-rosado](https://github.com/aj-rosado) **Base:** `release/2025.10-rc38` ← **Head:** `cp-pm-27806-respect-mp-policy` --- ### 📝 Commits (1) - [`3c3d674`](https://github.com/bitwarden/android/commit/3c3d67420a79328bff65921a996e5d65b8819c2c) [PM-27806] Reverted changes to order of StorePolicies after sync (#6130) ### 📊 Changes **3 files changed** (+47 additions, -33 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultSyncManagerImpl.kt` (+37 -33) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/di/VaultManagerModule.kt` (+3 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultSyncManagerTest.kt` (+7 -0) </details> ### 📄 Description ## 🎟️ Tracking PM-27806 Cherry-picked from https://github.com/bitwarden/android/pull/6130 ## 📔 Objective Reverted changes on the order when calling the storePolicies after the sync so that the flow properly navigates to update the master password. It had been changed in order to have the most recent policies when setting the UserState. ## ⏰ 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-11 03:44:02 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#12487