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

[PR #4179] [MERGED] [PM-12922] Disable delete if user can't manage collection #4753

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

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4179
Author: @SaintPatrck
Created: 10/28/2024
Status: ✅ Merged
Merged: 11/7/2024
Merged by: @SaintPatrck

Base: main ← Head: PM-12922/delete-collection-permission

📝 Commits (5)

  • 70a7e99 [PM-12922] Disable delete if user can't manage collection
  • ac02e5d Merge branch 'main' into PM-12922/delete-collection-permission
  • acec262 Merge branch 'main' into PM-12922/delete-collection-permission
  • 32b1526 Fix build failure
  • f381c4e Revert unnecessary formatting

📊 Changes

14 files changed (+503 additions, -13 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreen.kt (+1 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt (+25 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt (+3 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt (+2 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt (+29 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/model/VaultItemStateData.kt (+1 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/util/CipherViewExtensions.kt (+3 -1)
📝 app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CollectionViewUtil.kt (+6 -2)
📝 app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt (+140 -0)
📝 app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensionsTest.kt (+7 -0)
📝 app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt (+24 -4)
📝 app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt (+247 -0)
📝 app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/util/CipherViewExtensionsTest.kt (+13 -0)
📝 app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/util/VaultItemTestUtil.kt (+2 -0)

📄 Description

🎟️ Tracking

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

📔 Objective

Disables the delete button for items in collections where the user does not have "manage" permission.

This change ensures that users cannot delete items from collections they are not authorized to manage. It updates the UI to reflect the user's permissions and prevents accidental or unauthorized deletions.

Depends on #4169

📸 Screenshots

Before After
image image

⏰ 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/4179 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 10/28/2024 **Status:** ✅ Merged **Merged:** 11/7/2024 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `PM-12922/delete-collection-permission` --- ### 📝 Commits (5) - [`70a7e99`](https://github.com/bitwarden/android/commit/70a7e99c160f146be3f5320276e42098ad543e5f) [PM-12922] Disable delete if user can't manage collection - [`ac02e5d`](https://github.com/bitwarden/android/commit/ac02e5d963ab032c60c8d70d6d0ef6371629b9e5) Merge branch 'main' into PM-12922/delete-collection-permission - [`acec262`](https://github.com/bitwarden/android/commit/acec26245758bbd26d34030a90c877d78b9534d4) Merge branch 'main' into PM-12922/delete-collection-permission - [`32b1526`](https://github.com/bitwarden/android/commit/32b15263522ab65df9cc4ad153032ee9ca68cc43) Fix build failure - [`f381c4e`](https://github.com/bitwarden/android/commit/f381c4e93529eb91be8c843f3a0e4da43b4037b9) Revert unnecessary formatting ### 📊 Changes **14 files changed** (+503 additions, -13 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreen.kt` (+1 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt` (+25 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt` (+3 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt` (+2 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt` (+29 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/model/VaultItemStateData.kt` (+1 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/util/CipherViewExtensions.kt` (+3 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CollectionViewUtil.kt` (+6 -2) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt` (+140 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensionsTest.kt` (+7 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt` (+24 -4) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt` (+247 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/util/CipherViewExtensionsTest.kt` (+13 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/util/VaultItemTestUtil.kt` (+2 -0) </details> ### 📄 Description ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-12992 ## 📔 Objective Disables the delete button for items in collections where the user does not have "manage" permission. This change ensures that users cannot delete items from collections they are not authorized to manage. It updates the UI to reflect the user's permissions and prevents accidental or unauthorized deletions. Depends on #4169 ## 📸 Screenshots | Before | After | |--------|--------| | <img width="380" alt="image" src="https://github.com/user-attachments/assets/fa39778a-bf55-4ef6-b571-78acc383a79d"> | <img width="384" alt="image" src="https://github.com/user-attachments/assets/cf010d62-52ca-4dd0-95d4-c8695fce74bb"> | ## ⏰ 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:49:18 -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#4753
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?