github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-03-16 17:14:25 -05:00
Code Issues 144 Packages Projects Releases 116 Wiki Activity

[PR #4583] [MERGED] [PM-13351] Prevent editing of TOTP key in 'can edit except passwords' collection #5054

New Issue
Closed
opened 2025-11-26 23:53:24 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-26 23:53:24 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4583
Author: @mpbw2
Created: 1/17/2025
Status: ✅ Merged
Merged: 1/30/2025
Merged by: @mpbw2

Base: main ← Head: pm-13351/prevent-totp-edit-collection

📝 Commits (9)

  • f868269 [PM-13351] Prevent editing of TOTP key in 'can edit except passwords' collection
  • d7a015c match cardstyle
  • d229464 move modifier param
  • 23fdc59 Merge branch 'main' into pm-13351/prevent-totp-edit-collection
  • 3a6cfb3 Merge branch 'main' into pm-13351/prevent-totp-edit-collection
  • 69cbf23 change to textFieldTestTag
  • df78534 fix textfield margin
  • 466942a proper margin fix
  • c1c4f06 added tests

📊 Changes

2 files changed (+148 additions, -63 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditLoginItems.kt (+107 -63)
📝 app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreenTest.kt (+41 -0)

📄 Description

🎟️ Tracking

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

📔 Objective

This disables the ability to edit the TOTP key if the item is part of a collection with Can Edit, Except Passwords permission

📸 Screenshots

Item with existing TOTP key:

android_can-edit-except-pw-item-with-totp

Item without existing TOTP key:

android_can-edit-except-pw-item-without-totp

⏰ 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/4583 **Author:** [@mpbw2](https://github.com/mpbw2) **Created:** 1/17/2025 **Status:** ✅ Merged **Merged:** 1/30/2025 **Merged by:** [@mpbw2](https://github.com/mpbw2) **Base:** `main` ← **Head:** `pm-13351/prevent-totp-edit-collection` --- ### 📝 Commits (9) - [`f868269`](https://github.com/bitwarden/android/commit/f8682690058c4f2f11386f2976cc0ee5beaf2f6a) [PM-13351] Prevent editing of TOTP key in 'can edit except passwords' collection - [`d7a015c`](https://github.com/bitwarden/android/commit/d7a015c7a4b4ed306654507d69af750210922899) match cardstyle - [`d229464`](https://github.com/bitwarden/android/commit/d229464dbcb45882159296925ea7fedb252c6f78) move modifier param - [`23fdc59`](https://github.com/bitwarden/android/commit/23fdc595e6c96f0b9c304ab1c027e90d86fb3ba6) Merge branch 'main' into pm-13351/prevent-totp-edit-collection - [`3a6cfb3`](https://github.com/bitwarden/android/commit/3a6cfb37b83f386ce54c3be9fee33c267c1cfc9c) Merge branch 'main' into pm-13351/prevent-totp-edit-collection - [`69cbf23`](https://github.com/bitwarden/android/commit/69cbf23274ba52645ef0bace5f71a59cd4c7a67d) change to textFieldTestTag - [`df78534`](https://github.com/bitwarden/android/commit/df78534f54576d01d3f4fe2017f81772be206e72) fix textfield margin - [`466942a`](https://github.com/bitwarden/android/commit/466942a576fa56e21831e33af5936d4a4abec0ed) proper margin fix - [`c1c4f06`](https://github.com/bitwarden/android/commit/c1c4f06af8434307a961763537be1581bb1f775c) added tests ### 📊 Changes **2 files changed** (+148 additions, -63 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditLoginItems.kt` (+107 -63) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreenTest.kt` (+41 -0) </details> ### 📄 Description ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-13351 ## 📔 Objective This disables the ability to edit the TOTP key if the item is part of a collection with `Can Edit, Except Passwords` permission ## 📸 Screenshots Item with existing TOTP key: ![android_can-edit-except-pw-item-with-totp](https://github.com/user-attachments/assets/2105781c-d7b3-4fff-8fbc-76b8bb6b3438) Item without existing TOTP key: ![android_can-edit-except-pw-item-without-totp](https://github.com/user-attachments/assets/6378696a-5919-4711-aab6-43cab131a062) ## ⏰ 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 2025-11-26 23:53:24 -06:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
app:authenticator
app:password-manager
bug
bug-passkey
customer-support
duplicate
enhancement
good first issue
help wanted
needs-reply
needs-response
pull-request
Mirrored from GitHub Pull Request
 question
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#5054
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?