[PR #6643] [MERGED] [PM-33394] fix: Surface CookieRedirectException message during sync-on-unlock #125336

Closed
opened 2026-06-12 04:52:31 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

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

Base: mainHead: fix/PM-33394-sync-unlock-error


📝 Commits (1)

  • 6f364b0 [PM-33394] tech: Surface CookieRedirectException message during sync-on-unlock

📊 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

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

📔 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/6643 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 3/11/2026 **Status:** ✅ Merged **Merged:** 3/12/2026 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `fix/PM-33394-sync-unlock-error` --- ### 📝 Commits (1) - [`6f364b0`](https://github.com/bitwarden/android/commit/6f364b02c07383c694fcb2f1d698e3d702cc5c52) [PM-33394] tech: Surface CookieRedirectException message during sync-on-unlock ### 📊 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 https://bitwarden.atlassian.net/browse/PM-33394 ## 📔 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-06-12 04:52:31 -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#125336