[PR #3707] [MERGED] PM-10071 ensure that lowercase letters take priority over the upperca… #4360

Closed
opened 2025-11-26 23:43:26 -06:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/3707
Author: @dseverns-livefront
Created: 8/9/2024
Status: Merged
Merged: 8/9/2024
Merged by: @dseverns-livefront

Base: mainHead: PM-10071/pt2-electric-boogaloo


📝 Commits (3)

  • edfc9cf PM-10071 ensure that lowercase letters take priority over the uppercase version in sort order
  • 569801d update vault cipher sort test to match new logic
  • 0d65cc0 PR feedback on exception message

📊 Changes

9 files changed (+122 additions, -49 deletions)

View changed files

app/src/main/java/com/x8bit/bitwarden/data/platform/util/SpecialCharWithPrecedenceComparator.kt (+67 -0)
app/src/main/java/com/x8bit/bitwarden/data/platform/util/SpecialCharacterStringComparator.kt (+0 -38)
📝 app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCipherExtensions.kt (+2 -2)
📝 app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCollectionExtensions.kt (+2 -2)
📝 app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkFolderExtensions.kt (+2 -2)
📝 app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkSendExtensions.kt (+2 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensions.kt (+2 -2)
app/src/test/java/com/x8bit/bitwarden/data/platform/util/SpecialCharWithPrecedenceComparatorTest.kt (+44 -0)
📝 app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCipherExtensionsTest.kt (+1 -1)

📄 Description

🎟️ Tracking

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

📔 Objective

This was sent back from QA as was noticed that uppercase letters were showing higher in the order than lowercase if they were the same. Updated the comparator to compare the original chars if they are the same and give priority to the lowercase version.

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/3707 **Author:** [@dseverns-livefront](https://github.com/dseverns-livefront) **Created:** 8/9/2024 **Status:** ✅ Merged **Merged:** 8/9/2024 **Merged by:** [@dseverns-livefront](https://github.com/dseverns-livefront) **Base:** `main` ← **Head:** `PM-10071/pt2-electric-boogaloo` --- ### 📝 Commits (3) - [`edfc9cf`](https://github.com/bitwarden/android/commit/edfc9cf835013bbac9ed0aae5d08e615f38b8f0e) PM-10071 ensure that lowercase letters take priority over the uppercase version in sort order - [`569801d`](https://github.com/bitwarden/android/commit/569801d8eea60d16f4c9a61b8c55c69984d8dafc) update vault cipher sort test to match new logic - [`0d65cc0`](https://github.com/bitwarden/android/commit/0d65cc0bacef9f1a221a336a38d7c9dce14f705a) PR feedback on exception message ### 📊 Changes **9 files changed** (+122 additions, -49 deletions) <details> <summary>View changed files</summary> ➕ `app/src/main/java/com/x8bit/bitwarden/data/platform/util/SpecialCharWithPrecedenceComparator.kt` (+67 -0) ➖ `app/src/main/java/com/x8bit/bitwarden/data/platform/util/SpecialCharacterStringComparator.kt` (+0 -38) 📝 `app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCipherExtensions.kt` (+2 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCollectionExtensions.kt` (+2 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkFolderExtensions.kt` (+2 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkSendExtensions.kt` (+2 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensions.kt` (+2 -2) ➕ `app/src/test/java/com/x8bit/bitwarden/data/platform/util/SpecialCharWithPrecedenceComparatorTest.kt` (+44 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCipherExtensionsTest.kt` (+1 -1) </details> ### 📄 Description ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-10071 <!-- Paste the link to the Jira or GitHub issue or otherwise describe / point to where this change is coming from. --> ## 📔 Objective This was sent back from QA as was noticed that uppercase letters were showing higher in the order than lowercase if they were the same. Updated the comparator to compare the original chars if they are the same and give priority to the lowercase version. <!-- Describe what the purpose of this PR is, for example what bug you're fixing or new feature you're adding. --> ## ⏰ 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:43:26 -06:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#4360