[PR #6642] [MERGED] [PM-33394] debt: Add userFriendlyMessage extension and errorMessage to result types #113784

Closed
opened 2026-06-06 13:20:09 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/6642
Author: @SaintPatrck
Created: 3/11/2026
Status: Merged
Merged: 3/12/2026
Merged by: @david-livefront

Base: mainHead: fix/PM-33394-throwable-extensions


📝 Commits (2)

  • 58eafba [PM-33394] tech: Add userFriendlyMessage extension and errorMessage to result types
  • a7ed86d [PM-33394] tech: Add errorMessage to ImportCredentialsResult

📊 Changes

12 files changed (+105 additions, -20 deletions)

View changed files

app/src/main/kotlin/com/x8bit/bitwarden/data/platform/util/ThrowableExtensions.kt (+13 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/ArchiveCipherResult.kt (+6 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/CreateFolderResult.kt (+6 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/DeleteAttachmentResult.kt (+6 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/DeleteCipherResult.kt (+6 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/DeleteFolderResult.kt (+6 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/DeleteSendResult.kt (+6 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/ImportCredentialsResult.kt (+6 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/RestoreCipherResult.kt (+6 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/ShareCipherResult.kt (+6 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/UnarchiveCipherResult.kt (+6 -2)
app/src/test/kotlin/com/x8bit/bitwarden/data/platform/util/ThrowableExtensionsTest.kt (+32 -0)

📄 Description

🎟️ Tracking

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

📔 Objective

Adds infrastructure for propagating user-friendly error messages from exceptions through vault operation result types.

  • Introduces Throwable.userFriendlyMessage extension that extracts display-safe messages from allow-listed exception types (currently CookieRedirectException)
  • Adds optional errorMessage parameter to Error variants of 9 vault result sealed classes, enabling ViewModels to display specific error text when available
  • Includes unit tests for the new extension property

🔄 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/6642 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 3/11/2026 **Status:** ✅ Merged **Merged:** 3/12/2026 **Merged by:** [@david-livefront](https://github.com/david-livefront) **Base:** `main` ← **Head:** `fix/PM-33394-throwable-extensions` --- ### 📝 Commits (2) - [`58eafba`](https://github.com/bitwarden/android/commit/58eafba0763886684c26ac740077def5e5136973) [PM-33394] tech: Add userFriendlyMessage extension and errorMessage to result types - [`a7ed86d`](https://github.com/bitwarden/android/commit/a7ed86dbf87bd33241fa43b1fd3aa16487dddc97) [PM-33394] tech: Add errorMessage to ImportCredentialsResult ### 📊 Changes **12 files changed** (+105 additions, -20 deletions) <details> <summary>View changed files</summary> ➕ `app/src/main/kotlin/com/x8bit/bitwarden/data/platform/util/ThrowableExtensions.kt` (+13 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/ArchiveCipherResult.kt` (+6 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/CreateFolderResult.kt` (+6 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/DeleteAttachmentResult.kt` (+6 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/DeleteCipherResult.kt` (+6 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/DeleteFolderResult.kt` (+6 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/DeleteSendResult.kt` (+6 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/ImportCredentialsResult.kt` (+6 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/RestoreCipherResult.kt` (+6 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/ShareCipherResult.kt` (+6 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/UnarchiveCipherResult.kt` (+6 -2) ➕ `app/src/test/kotlin/com/x8bit/bitwarden/data/platform/util/ThrowableExtensionsTest.kt` (+32 -0) </details> ### 📄 Description ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-33394 ## 📔 Objective Adds infrastructure for propagating user-friendly error messages from exceptions through vault operation result types. - Introduces `Throwable.userFriendlyMessage` extension that extracts display-safe messages from allow-listed exception types (currently `CookieRedirectException`) - Adds optional `errorMessage` parameter to `Error` variants of 9 vault result sealed classes, enabling ViewModels to display specific error text when available - Includes unit tests for the new extension property --- <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-06-06 13:20:09 -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#113784