[PR #6644] [MERGED] 🍒[PM-33394] debt: Add userFriendlyMessage extension and errorMessage to result types #113786

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

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/6644
Author: @SaintPatrck
Created: 3/12/2026
Status: Merged
Merged: 3/12/2026
Merged by: @SaintPatrck

Base: release/2026.3-rc48Head: release/2026.3-rc48_cp-33394-part1


📝 Commits (1)

  • 0b8aaf3 [PM-33394] debt: Add userFriendlyMessage extension and errorMessage to result types (#6642)

📊 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

PM-33394
Cherry-picked from #6642

📔 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/6644 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 3/12/2026 **Status:** ✅ Merged **Merged:** 3/12/2026 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `release/2026.3-rc48` ← **Head:** `release/2026.3-rc48_cp-33394-part1` --- ### 📝 Commits (1) - [`0b8aaf3`](https://github.com/bitwarden/android/commit/0b8aaf3de6a60d00fb2353cc6d68ee7433a79f97) [PM-33394] debt: Add userFriendlyMessage extension and errorMessage to result types (#6642) ### 📊 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 PM-33394 Cherry-picked from #6642 ## 📔 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:24 -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#113786