[PR #6532] [MERGED] [PM-30870] Fix editing blocked autofill URIs #26028

Closed
opened 2026-04-17 01:34:51 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/6532
Author: @andrebispo5
Created: 2/13/2026
Status: Merged
Merged: 2/16/2026
Merged by: @andrebispo5

Base: mainHead: pm-30870/bugfix-edit-blocked-uri


📝 Commits (8)

  • 017e709 [PM-30870] Add originalUri parameter to SaveUri action
  • d1bd61a [PM-30870] Update handleSaveUri to support editing blocked URIs
  • 035e689 [PM-30870] Update BlockAutoFillScreen to pass originalUri when saving
  • 46f6dbe [PM-30870] Add tests for editing blocked URIs
  • 875a16e [PM-30870] Fix chaining
  • 3ddb053 [PM-30870] Change assert not null
  • 076dc46 [PM-30870] Assert state test
  • 716640c [PM-30870] Remove unnecessary max length suppress

📊 Changes

3 files changed (+120 additions, -12 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/BlockAutoFillScreen.kt (+7 -3)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/BlockAutoFillViewModel.kt (+23 -7)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/BlockAutoFillViewModelTest.kt (+90 -2)

📄 Description

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-30870

📔 Objective

Fix an issue where editing a blocked autofill URI would incorrectly trigger duplicate validation errors. Previously, when a user attempted to edit an existing blocked URI, the validation would compare against the full list including the original URI, causing false duplicate errors even when saving the same value or making minor modifications.

Changes

  • Add originalUri parameter to track which URI is being edited
  • Exclude the original URI from duplicate validation during edits
  • Remove the original URI before adding the updated value to properly replace it

📸 Screenshots

https://github.com/user-attachments/assets/2a4a44b9-eca1-48e9-b0ef-d87e47e0a256


🔄 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/6532 **Author:** [@andrebispo5](https://github.com/andrebispo5) **Created:** 2/13/2026 **Status:** ✅ Merged **Merged:** 2/16/2026 **Merged by:** [@andrebispo5](https://github.com/andrebispo5) **Base:** `main` ← **Head:** `pm-30870/bugfix-edit-blocked-uri` --- ### 📝 Commits (8) - [`017e709`](https://github.com/bitwarden/android/commit/017e709eda5c4c03454992a51cb79ab5b386e6ee) [PM-30870] Add originalUri parameter to SaveUri action - [`d1bd61a`](https://github.com/bitwarden/android/commit/d1bd61ae518cbd1f3ac2a62c31ecb6ff11f02425) [PM-30870] Update handleSaveUri to support editing blocked URIs - [`035e689`](https://github.com/bitwarden/android/commit/035e6892b33cdbf483e2450fd558581bb1eccd55) [PM-30870] Update BlockAutoFillScreen to pass originalUri when saving - [`46f6dbe`](https://github.com/bitwarden/android/commit/46f6dbe59f1feac8bfabcbaecda86c705ce16ca7) [PM-30870] Add tests for editing blocked URIs - [`875a16e`](https://github.com/bitwarden/android/commit/875a16e7780d41205660295d0326a7afd1c8c363) [PM-30870] Fix chaining - [`3ddb053`](https://github.com/bitwarden/android/commit/3ddb053d56b6cd358c3ac1ec877feea1f49bb4e4) [PM-30870] Change assert not null - [`076dc46`](https://github.com/bitwarden/android/commit/076dc46afacb811bd2d940de305c1ecf3e35e954) [PM-30870] Assert state test - [`716640c`](https://github.com/bitwarden/android/commit/716640cdc8a17fcfa479be1630caa807b9f75188) [PM-30870] Remove unnecessary max length suppress ### 📊 Changes **3 files changed** (+120 additions, -12 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/BlockAutoFillScreen.kt` (+7 -3) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/BlockAutoFillViewModel.kt` (+23 -7) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/BlockAutoFillViewModelTest.kt` (+90 -2) </details> ### 📄 Description ## 🎟️ Tracking <!-- Paste the link to the Jira or GitHub issue or otherwise describe / point to where this change is coming from. --> https://bitwarden.atlassian.net/browse/PM-30870 ## 📔 Objective <!-- Describe what the purpose of this PR is, for example what bug you're fixing or new feature you're adding. --> Fix an issue where editing a blocked autofill URI would incorrectly trigger duplicate validation errors. Previously, when a user attempted to edit an existing blocked URI, the validation would compare against the full list including the original URI, causing false duplicate errors even when saving the same value or making minor modifications. Changes - Add originalUri parameter to track which URI is being edited - Exclude the original URI from duplicate validation during edits - Remove the original URI before adding the updated value to properly replace it ## 📸 Screenshots <!-- Required for any UI changes; delete if not applicable. Use fixed width images for better display. --> https://github.com/user-attachments/assets/2a4a44b9-eca1-48e9-b0ef-d87e47e0a256 --- <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-17 01:34:52 -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#26028