github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-05-07 19:39:41 -05:00
Code Issues 1.1k Packages Projects Releases 122 Wiki Activity

[PR #6645] [MERGED] 🍒[PM-33394] fix: Surface CookieRedirectException message during sync-on-unlock #32756

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

📋 Pull Request Information

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

Base: release/2026.3-rc48 ← Head: release/2026.3-rc48_cp-33394-sync-on-unlock

📝 Commits (1)

  • fb0561d [PM-33394] fix: Surface CookieRedirectException message during sync-on-unlock (#6643)

📊 Changes

2 files changed (+100 additions, -1 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt (+3 -1)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModelTest.kt (+97 -0)

📄 Description

🎟️ Tracking

PM-33394
Cherry-picked from #6643

📔 Objective

Surfaces the user-friendly error message from CookieRedirectException in the vault screen when a sync-on-unlock fails due to a cookie redirect, replacing the generic error message with actionable text.

  • Uses the Throwable.userFriendlyMessage extension (from the base branch) to extract the display-safe message in VaultViewModel.updateToErrorStateOrDialog
  • Falls back to the generic error message when no user-friendly message is available
  • Adds tests for both the no-data (ViewState.Error) and with-data (DialogState.Error) paths

🔄 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/6645 **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-sync-on-unlock` --- ### 📝 Commits (1) - [`fb0561d`](https://github.com/bitwarden/android/commit/fb0561d1f6ab4b6a22a0c86e02983f7a604fe1bc) [PM-33394] fix: Surface CookieRedirectException message during sync-on-unlock (#6643) ### 📊 Changes **2 files changed** (+100 additions, -1 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt` (+3 -1) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModelTest.kt` (+97 -0) </details> ### 📄 Description ## 🎟️ Tracking PM-33394 Cherry-picked from #6643 ## 📔 Objective Surfaces the user-friendly error message from `CookieRedirectException` in the vault screen when a sync-on-unlock fails due to a cookie redirect, replacing the generic error message with actionable text. - Uses the `Throwable.userFriendlyMessage` extension (from the base branch) to extract the display-safe message in `VaultViewModel.updateToErrorStateOrDialog` - Falls back to the generic error message when no user-friendly message is available - Adds tests for both the no-data (`ViewState.Error`) and with-data (`DialogState.Error`) paths --- <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:26 -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 Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#32756
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?