github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-08-16 19:04:56 -05:00
Code Issues 2.4k Packages Projects Releases 129 Wiki Activity

[PR #5968] [MERGED] [PM-26330] Correct owner data when individual vault is disabled #63462

New Issue
Closed
opened 2026-05-12 02:55:18 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-05-12 02:55:18 -05:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/5968
Author: @SaintPatrck
Created: 10/1/2025
Status: ✅ Merged
Merged: 10/2/2025
Merged by: @SaintPatrck

Base: main ← Head: PM-26330/fix-default-owner-and-collection

📝 Commits (1)

  • 780343e [PM-26330] Correct owner data when individual vault is disabled

📊 Changes

2 files changed (+146 additions, -35 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt (+35 -1)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensionsTest.kt (+111 -34)

📄 Description

🎟️ Tracking

PM-26330

📔 Objective

This commit fixes an issue where the owner data was not correctly set when the individual vault was disabled. The appendFolderAndOwnerData function in CipherViewExtensions.kt has been updated to correctly determine the default owner and collection when the individual vault is disabled.

Additionally, new tests have been added to CipherViewExtensionsTest.kt to cover this scenario.

📸 Screenshots

Coming soon!

⏰ Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Protected functional changes with optionality (feature flags)
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation (Confluence, contributing docs) 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/5968 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 10/1/2025 **Status:** ✅ Merged **Merged:** 10/2/2025 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `PM-26330/fix-default-owner-and-collection` --- ### 📝 Commits (1) - [`780343e`](https://github.com/bitwarden/android/commit/780343edec8cefee326fe805e000c0df1b9384a6) [PM-26330] Correct owner data when individual vault is disabled ### 📊 Changes **2 files changed** (+146 additions, -35 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt` (+35 -1) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensionsTest.kt` (+111 -34) </details> ### 📄 Description ## 🎟️ Tracking PM-26330 ## 📔 Objective This commit fixes an issue where the owner data was not correctly set when the individual vault was disabled. The `appendFolderAndOwnerData` function in `CipherViewExtensions.kt` has been updated to correctly determine the default owner and collection when the individual vault is disabled. Additionally, new tests have been added to `CipherViewExtensionsTest.kt` to cover this scenario. ## 📸 Screenshots Coming soon! ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Protected functional changes with optionality (feature flags) - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation (Confluence, contributing docs) 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-05-12 02:55:18 -05: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 labels pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
GiteaMirror ninjasurge (Kaehlen Rog)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#63462