[PR #5791] [MERGED] 🍒[PM-25057] Refactor card restriction logic in AutofillCipherProvider #36550

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

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/5791
Author: @SaintPatrck
Created: 8/27/2025
Status: Merged
Merged: 8/27/2025
Merged by: @SaintPatrck

Base: release/2025.8-rc33Head: cp/cc-policy-fix-to-release-2025.8-rc33


📝 Commits (1)

  • 8b2f33f [PM-25057] Refactor card restriction logic in AutofillCipherProvider (#5788)

📊 Changes

2 files changed (+41 additions, -3 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/provider/AutofillCipherProviderImpl.kt (+24 -1)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/autofill/processor/AutofillCipherProviderTest.kt (+17 -2)

📄 Description

🎟️ Tracking

PM-25057

Cherry-picked from #5788 (aab81984)

📔 Objective

Correct the logic for handling organization-based card type restrictions within the autofill feature.

The isExcludedByOrgCardRestrictions function was introduced in AutofillCipherProviderImpl.kt to consolidate the logic for determining if a CipherListView item should be excluded due to these restrictions. This function now correctly handles cases where:

  • The item is a personal vault item and any organization has card type restrictions.
  • The item belongs to an organization that has card type restrictions.

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/5791 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 8/27/2025 **Status:** ✅ Merged **Merged:** 8/27/2025 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `release/2025.8-rc33` ← **Head:** `cp/cc-policy-fix-to-release-2025.8-rc33` --- ### 📝 Commits (1) - [`8b2f33f`](https://github.com/bitwarden/android/commit/8b2f33fb7c27002b0454a308c8bffb1c450377d8) [PM-25057] Refactor card restriction logic in AutofillCipherProvider (#5788) ### 📊 Changes **2 files changed** (+41 additions, -3 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/provider/AutofillCipherProviderImpl.kt` (+24 -1) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/autofill/processor/AutofillCipherProviderTest.kt` (+17 -2) </details> ### 📄 Description ## 🎟️ Tracking PM-25057 Cherry-picked from #5788 (aab81984) ## 📔 Objective Correct the logic for handling organization-based card type restrictions within the autofill feature. The `isExcludedByOrgCardRestrictions` function was introduced in `AutofillCipherProviderImpl.kt` to consolidate the logic for determining if a `CipherListView` item should be excluded due to these restrictions. This function now correctly handles cases where: - The item is a personal vault item and any organization has card type restrictions. - The item belongs to an organization that has card type restrictions. ## ⏰ 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-21 03:44:20 -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#36550