[PR #5819] [MERGED] [PM-25394] Sort default user collections by Organization name #12211

Closed
opened 2026-04-11 03:37:50 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/5819
Author: @SaintPatrck
Created: 9/2/2025
Status: Merged
Merged: 9/3/2025
Merged by: @SaintPatrck

Base: mainHead: PM-25394/sort-default-collections-by-org-name


📝 Commits (1)

  • c491235 [PM-25394] Refactor Collection sorting to include Organization name

📊 Changes

3 files changed (+61 additions, -15 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt (+6 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCollectionExtensions.kt (+33 -9)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCollectionExtensionsTest.kt (+22 -4)

📄 Description

🎟️ Tracking

PM-25394

📔 Objective

Update the sorting logic for CollectionView lists.

Now, DEFAULT_USER_COLLECTION types are sorted by their corresponding organization's name instead of the collection's name.

Other collection types continue to be sorted by their name.

This change applies to the VaultRepositoryImpl when fetching collections.

Tests have been updated to reflect this new sorting behavior.

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/5819 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 9/2/2025 **Status:** ✅ Merged **Merged:** 9/3/2025 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `PM-25394/sort-default-collections-by-org-name` --- ### 📝 Commits (1) - [`c491235`](https://github.com/bitwarden/android/commit/c4912358927881cafbacf5d6fc3d8cf1319976f7) [PM-25394] Refactor Collection sorting to include Organization name ### 📊 Changes **3 files changed** (+61 additions, -15 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt` (+6 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCollectionExtensions.kt` (+33 -9) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCollectionExtensionsTest.kt` (+22 -4) </details> ### 📄 Description ## 🎟️ Tracking PM-25394 ## 📔 Objective Update the sorting logic for `CollectionView` lists. Now, `DEFAULT_USER_COLLECTION` types are sorted by their corresponding organization's name instead of the collection's name. Other collection types continue to be sorted by their name. This change applies to the `VaultRepositoryImpl` when fetching collections. Tests have been updated to reflect this new sorting behavior. ## ⏰ 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-04-11 03:37:50 -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#12211