[PR #3436] [MERGED] PM-8202 move dialog status to VM for restore item, add check for MP p… #122811

Closed
opened 2026-06-12 00:42:55 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/3436
Author: @dseverns-livefront
Created: 7/10/2024
Status: Merged
Merged: 7/12/2024
Merged by: @dseverns-livefront

Base: mainHead: PM-8202-mp-reprompt-on-trash-items


📝 Commits (6)

  • d447b2b PM-8202 move dialog status to VM for restore item, add check for MP prompt to restore item when needed
  • 4ba67b2 Detekt
  • 622a509 detekt and PR feedback
  • d4be04a tests
  • 59c6950 PR feedback and additional tests in screen test
  • 2024f0c accurate test names

📊 Changes

4 files changed (+365 additions, -265 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt (+23 -27)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt (+204 -215)
📝 app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt (+71 -23)
📝 app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt (+67 -0)

📄 Description

🎟️ Tracking

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

📔 Objective

If an item which requires re-prompt of the master password is restored, the user should be prompted to enter MP before given the option to restore.

📸 Screenshots

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/3436 **Author:** [@dseverns-livefront](https://github.com/dseverns-livefront) **Created:** 7/10/2024 **Status:** ✅ Merged **Merged:** 7/12/2024 **Merged by:** [@dseverns-livefront](https://github.com/dseverns-livefront) **Base:** `main` ← **Head:** `PM-8202-mp-reprompt-on-trash-items` --- ### 📝 Commits (6) - [`d447b2b`](https://github.com/bitwarden/android/commit/d447b2b58a6dbfac1b1756d5fe6774ad1f1d96d2) PM-8202 move dialog status to VM for restore item, add check for MP prompt to restore item when needed - [`4ba67b2`](https://github.com/bitwarden/android/commit/4ba67b2c71602083b054babeb3cfe03ba9692347) Detekt - [`622a509`](https://github.com/bitwarden/android/commit/622a509cdb94aa417427532d3ff9f7cff464228d) detekt and PR feedback - [`d4be04a`](https://github.com/bitwarden/android/commit/d4be04aca344658e54c6c22dcfb7eaf4c2aa7c19) tests - [`59c6950`](https://github.com/bitwarden/android/commit/59c695032e2dc3fb6041a4da575567bb66f1e486) PR feedback and additional tests in screen test - [`2024f0c`](https://github.com/bitwarden/android/commit/2024f0ca0ff8c34d965569f397e2ebc86b37da3c) accurate test names ### 📊 Changes **4 files changed** (+365 additions, -265 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt` (+23 -27) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt` (+204 -215) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt` (+71 -23) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt` (+67 -0) </details> ### 📄 Description ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-8202 <!-- Paste the link to the Jira or GitHub issue or otherwise describe / point to where this change is coming from. --> ## 📔 Objective If an item which requires re-prompt of the master password is restored, the user should be prompted to enter MP before given the option to restore. <!-- Describe what the purpose of this PR is, for example what bug you're fixing or new feature you're adding. --> ## 📸 Screenshots <!-- Required for any UI changes; delete if not applicable. Use fixed width images for better display. --> ## ⏰ 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 --- <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-06-12 00:42:55 -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#122811