[PR #6652] [MERGED] [PM-33560] debt: Wire SendManager and Send ViewModel error handlers #113794

Closed
opened 2026-06-06 13:21:30 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

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

Base: mainHead: fix/PM-33394-send-error-handlers


📝 Commits (2)

  • 1c53d4c [PM-33394] tech: Wire SendManager and Send ViewModel error handlers
  • a7e7768 Default errorMessage to error.userFriendlyMessage in DeleteSendResult

📊 Changes

8 files changed (+168 additions, -4 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/DeleteSendResult.kt (+3 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModel.kt (+4 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/AddEditSendViewModel.kt (+4 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/viewsend/ViewSendViewModel.kt (+4 -1)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/SendManagerTest.kt (+22 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModelTest.kt (+38 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/AddEditSendViewModelTest.kt (+53 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/viewsend/ViewSendViewModelTest.kt (+40 -0)

📄 Description

🎟️ Tracking

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

📔 Objective

Wire userFriendlyMessage through SendManager fold(onFailure) for deleteSend and update all Send-related ViewModel error handlers to prefer errorMessage over generic defaults.

This is part of the PM-33394 series to surface CookieRedirectException user-friendly messages through result types to ViewModels. The foundation (userFriendlyMessage extension and errorMessage on result types) was merged in #6642.

Changes:

  • Wire userFriendlyMessage in SendManager for deleteSend
  • Update SendViewModel, AddEditSendViewModel, and ViewSendViewModel error handlers
  • Add SendManager and ViewModel tests for CookieRedirectException error message propagation

🔄 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/6652 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 3/12/2026 **Status:** ✅ Merged **Merged:** 3/13/2026 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `fix/PM-33394-send-error-handlers` --- ### 📝 Commits (2) - [`1c53d4c`](https://github.com/bitwarden/android/commit/1c53d4c6df8b46eef00c2a8fa32e01a71c7a9740) [PM-33394] tech: Wire SendManager and Send ViewModel error handlers - [`a7e7768`](https://github.com/bitwarden/android/commit/a7e776817753a16c770d8aa4f4d7e48d7a6ee09a) Default errorMessage to error.userFriendlyMessage in DeleteSendResult ### 📊 Changes **8 files changed** (+168 additions, -4 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/DeleteSendResult.kt` (+3 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModel.kt` (+4 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/AddEditSendViewModel.kt` (+4 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/viewsend/ViewSendViewModel.kt` (+4 -1) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/SendManagerTest.kt` (+22 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModelTest.kt` (+38 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/AddEditSendViewModelTest.kt` (+53 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/viewsend/ViewSendViewModelTest.kt` (+40 -0) </details> ### 📄 Description ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-33560 ## 📔 Objective Wire `userFriendlyMessage` through SendManager `fold(onFailure)` for `deleteSend` and update all Send-related ViewModel error handlers to prefer `errorMessage` over generic defaults. This is part of the PM-33394 series to surface `CookieRedirectException` user-friendly messages through result types to ViewModels. The foundation (`userFriendlyMessage` extension and `errorMessage` on result types) was merged in #6642. **Changes:** - Wire `userFriendlyMessage` in SendManager for deleteSend - Update SendViewModel, AddEditSendViewModel, and ViewSendViewModel error handlers - Add SendManager and ViewModel tests for CookieRedirectException error message propagation --- <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:21:30 -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#113794