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

[PR #4254] [MERGED] [PM-11304] Ownership Not Defaulting To Org and Collection #4806

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

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4254
Author: @andrebispo5
Created: 11/7/2024
Status: ✅ Merged
Merged: 11/14/2024
Merged by: @andrebispo5

Base: main ← Head: pm-11304/add-item-collection

📝 Commits (10+)

  • 96a3aa9 [PM-11303] Add button visible inside folders
  • ad055f3 [PM-11303] Add selected folder id navigation parameter to preselect add item folder
  • a52588f [PM-11303] Add missing tests
  • b185412 [PM-11304] Add collection Id to navigation params
  • 96f118e [PM-11304] Enable fab for collection vault listings
  • 9213ad2 [PM-11304] Select owner and collection if creating cipher from an org folder
  • 3dc7657 [PM-11304] Update show add cipher fab button logic
  • c70ff9b [PM-11303] Code cleanup
  • 4aef4dd Merge branch 'pm-11303/plus-icon-folders' into pm-11304/add-item-collection
  • 0387f0b [PM-11304] Code clean up

📊 Changes

12 files changed (+68 additions, -27 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlocked/VaultUnlockedNavigation.kt (+4 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarNavigation.kt (+1 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarScreen.kt (+2 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditNavigation.kt (+12 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt (+4 -3)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt (+18 -11)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingNavigation.kt (+4 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreen.kt (+3 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt (+16 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultGraphNavigation.kt (+2 -1)
📝 app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarScreenTest.kt (+1 -1)
📝 app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt (+1 -1)

📄 Description

🎟️ Tracking

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

📔 Objective

Fix bug where the ownership and collection is not defaulting to the screen where it is being created at.
Also fixed the add item float button that wasn't showing for collection.

📸 Screenshots

https://github.com/user-attachments/assets/f930ca72-0021-4db4-8cda-242b992b6800

⏰ 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/4254 **Author:** [@andrebispo5](https://github.com/andrebispo5) **Created:** 11/7/2024 **Status:** ✅ Merged **Merged:** 11/14/2024 **Merged by:** [@andrebispo5](https://github.com/andrebispo5) **Base:** `main` ← **Head:** `pm-11304/add-item-collection` --- ### 📝 Commits (10+) - [`96a3aa9`](https://github.com/bitwarden/android/commit/96a3aa9f746ab5ba9d99ee77e46280a0cdad70e1) [PM-11303] Add button visible inside folders - [`ad055f3`](https://github.com/bitwarden/android/commit/ad055f3465071f04ef656d8b0de87c548f806024) [PM-11303] Add selected folder id navigation parameter to preselect add item folder - [`a52588f`](https://github.com/bitwarden/android/commit/a52588fe7ebb982917446bba2e8f7cf7379b0e69) [PM-11303] Add missing tests - [`b185412`](https://github.com/bitwarden/android/commit/b185412fbab5416e36bc845dfacd2995c66a8e91) [PM-11304] Add collection Id to navigation params - [`96f118e`](https://github.com/bitwarden/android/commit/96f118e1e4cdcba48d3eaf751dbd7ca0abd6182c) [PM-11304] Enable fab for collection vault listings - [`9213ad2`](https://github.com/bitwarden/android/commit/9213ad288252e4250c4755ad1d4f890e1c1b3d7d) [PM-11304] Select owner and collection if creating cipher from an org folder - [`3dc7657`](https://github.com/bitwarden/android/commit/3dc76578d3205bd976409659e840a5b9b1311fec) [PM-11304] Update show add cipher fab button logic - [`c70ff9b`](https://github.com/bitwarden/android/commit/c70ff9be3661fd7a35345a5708d3661efa3c6aa6) [PM-11303] Code cleanup - [`4aef4dd`](https://github.com/bitwarden/android/commit/4aef4ddebb8251330fc7595f99d3892208fb9ee5) Merge branch 'pm-11303/plus-icon-folders' into pm-11304/add-item-collection - [`0387f0b`](https://github.com/bitwarden/android/commit/0387f0b10a00cd9b8b647f777fd081fa4ced446d) [PM-11304] Code clean up ### 📊 Changes **12 files changed** (+68 additions, -27 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlocked/VaultUnlockedNavigation.kt` (+4 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarNavigation.kt` (+1 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarScreen.kt` (+2 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditNavigation.kt` (+12 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt` (+4 -3) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt` (+18 -11) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingNavigation.kt` (+4 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreen.kt` (+3 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt` (+16 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultGraphNavigation.kt` (+2 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarScreenTest.kt` (+1 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt` (+1 -1) </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-11304 ## 📔 Objective <!-- Describe what the purpose of this PR is, for example what bug you're fixing or new feature you're adding. --> Fix bug where the ownership and collection is not defaulting to the screen where it is being created at. Also fixed the add item float button that wasn't showing for collection. ## 📸 Screenshots <!-- Required for any UI changes; delete if not applicable. Use fixed width images for better display. --> https://github.com/user-attachments/assets/f930ca72-0021-4db4-8cda-242b992b6800 ## ⏰ 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:50:01 -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#4806
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?