github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-08-15 08:34:16 -05:00
Code Issues 2.4k Packages Projects Releases 129 Wiki Activity

[PR #6653] [MERGED] [PM-33394] debt: Wire FolderManager and folder ViewModel error handlers #32764

New Issue
Closed
opened 2026-04-18 16:07:55 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-18 16:07:55 -05:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

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

Base: main ← Head: fix/PM-33394-folder-error-handlers

📝 Commits (4)

  • 3625cc4 [PM-33394] tech: Wire FolderManager and folder ViewModel error handlers
  • 6533e9c Default errorMessage to error.userFriendlyMessage in folder result types
  • d6e9111 Wire errorMessage through UpdateFolderResult error handler
  • fe13624 Remove explicit errorMessage in updateFolder onFailure to use default

📊 Changes

6 files changed (+171 additions, -14 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/FolderManagerImpl.kt (+8 -8)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/CreateFolderResult.kt (+2 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/DeleteFolderResult.kt (+3 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/UpdateFolderResult.kt (+5 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModel.kt (+12 -3)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModelTest.kt (+141 -0)

📄 Description

🎟️ Tracking

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

📔 Objective

Wire userFriendlyMessage through FolderManager fold(onFailure) for createFolder and deleteFolder, and update FolderAddEditViewModel 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 FolderManager for createFolder and deleteFolder
  • Update FolderAddEditViewModel error handlers
  • Add FolderAddEditViewModel 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/6653 **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-folder-error-handlers` --- ### 📝 Commits (4) - [`3625cc4`](https://github.com/bitwarden/android/commit/3625cc4dbdd9012d36995d7b979b9d9a3219b444) [PM-33394] tech: Wire FolderManager and folder ViewModel error handlers - [`6533e9c`](https://github.com/bitwarden/android/commit/6533e9cf2445de2ba8a988de366fb4d3505d7584) Default errorMessage to error.userFriendlyMessage in folder result types - [`d6e9111`](https://github.com/bitwarden/android/commit/d6e91111aa98c016a42dd0d9d32864bf4263b0b1) Wire errorMessage through UpdateFolderResult error handler - [`fe13624`](https://github.com/bitwarden/android/commit/fe136249ec12f18186af61076656fcb3aa766038) Remove explicit errorMessage in updateFolder onFailure to use default ### 📊 Changes **6 files changed** (+171 additions, -14 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/FolderManagerImpl.kt` (+8 -8) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/CreateFolderResult.kt` (+2 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/DeleteFolderResult.kt` (+3 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/model/UpdateFolderResult.kt` (+5 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModel.kt` (+12 -3) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModelTest.kt` (+141 -0) </details> ### 📄 Description ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-33394 ## 📔 Objective Wire `userFriendlyMessage` through FolderManager `fold(onFailure)` for `createFolder` and `deleteFolder`, and update FolderAddEditViewModel 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 FolderManager for createFolder and deleteFolder - Update FolderAddEditViewModel error handlers - Add FolderAddEditViewModel 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-04-18 16:07:55 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
app:authenticator
app:password-manager
bug
bug-passkey
customer-support
duplicate
enhancement
good first issue
help wanted
needs-reply
needs-response
pull-request
Mirrored from GitHub Pull Request
 question
No labels pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
GiteaMirror ninjasurge (Kaehlen Rog)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#32764