[PR #6529] [MERGED] [PM-32122] Add cookie acquisition navigation #81884

Closed
opened 2026-05-19 20:21:21 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

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

Base: main ← Head: cookie-vending/p11-t12_navigation


📝 Commits (4)

  • d85e803 [PM-32122] Wire cookie acquisition navigation and deeplink callback
  • 17446c2 Refactored CookieAcquisitionNavigation
  • 7fb9d1b removed onDismissCalled assignment from setUp in CookieAcquisitionScreenTest
  • 6c97fc5 Update app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/cookieacquisition/CookieAcquisitionNavigation.kt

📊 Changes

14 files changed (+272 additions, -18 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/AuthCallbackViewModel.kt (+8 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/MainActivity.kt (+12 -3)
📝 app/src/main/kotlin/com/x8bit/bitwarden/MainViewModel.kt (+37 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/cookieacquisition/CookieAcquisitionNavigation.kt (+12 -10)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/cookieacquisition/CookieAcquisitionScreen.kt (+11 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/cookieacquisition/CookieAcquisitionViewModel.kt (+11 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/debugmenu/DebugMenuScreen.kt (+15 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/debugmenu/DebugMenuViewModel.kt (+24 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/AuthCallbackViewModelTest.kt (+28 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/MainViewModelTest.kt (+47 -2)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/cookieacquisition/CookieAcquisitionScreenTest.kt (+19 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/cookieacquisition/CookieAcquisitionViewModelTest.kt (+20 -2)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/debugmenu/DebugMenuViewModelTest.kt (+27 -0)
📝 ui/src/main/res/values/strings_non_localized.xml (+1 -0)

📄 Description

🎟️ Tracking

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

📔 Objective

Add cookie acquisition as a top-level destination in the outer NavHost (alongside root navigation and debug menu) so it can overlay the app without interfering with the state-based navigation in RootNavScreen.

MainViewModel monitors the cookie acquisition request flow combined with user/vault state and emits a one-shot NavigateToCookieAcquisition event when conditions are met. Dismissal is handled by the child CookieAcquisitionViewModel via a NavigateBack event (implementing BackgroundEvent to survive Custom Tab lifecycle transitions), which triggers popBackStack through an onDismiss callback.

Wire the AuthCallback deeplink so cookie results from the browser are delivered back to the auth repository's cookie callback result flow.

Add debug menu controls for triggering cookie acquisition manually during development.

🧪 Testing

  1. Log in and unlock the vault
  2. Open the debug menu and tap "Trigger cookie acquisition"
  3. Verify the cookie acquisition screen slides up
  4. Tap "Launch browser" — verify custom tab opens
  5. Simulate the deeplink callback: adb shell am start -a android.intent.action.VIEW -d "bitwarden://sso_cookie_vendor?cookie=value&d=1" — verify the screen auto-dismisses
  6. Tap "Continue without syncing" — verify the screen dismisses
  7. Tap "Why am I seeing this?" — verify help URL opens

📸 Screenshots

## 📋 Pull Request Information **Original PR:** https://github.com/bitwarden/android/pull/6529 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 2/12/2026 **Status:** ✅ Merged **Merged:** 2/18/2026 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `cookie-vending/p11-t12_navigation` --- ### 📝 Commits (4) - [`d85e803`](https://github.com/bitwarden/android/commit/d85e803ea85a43d2a4d12475cdfd9f2b13280ae9) [PM-32122] Wire cookie acquisition navigation and deeplink callback - [`17446c2`](https://github.com/bitwarden/android/commit/17446c21618349bb5522933eb12bc5b5ab7402ee) Refactored CookieAcquisitionNavigation - [`7fb9d1b`](https://github.com/bitwarden/android/commit/7fb9d1b9d2b8046d46ed32942256efa908804eb5) removed onDismissCalled assignment from setUp in CookieAcquisitionScreenTest - [`6c97fc5`](https://github.com/bitwarden/android/commit/6c97fc58b2672b8d9e3944084fb8a3156bc0d6e0) Update app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/cookieacquisition/CookieAcquisitionNavigation.kt ### 📊 Changes **14 files changed** (+272 additions, -18 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/AuthCallbackViewModel.kt` (+8 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/MainActivity.kt` (+12 -3) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/MainViewModel.kt` (+37 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/cookieacquisition/CookieAcquisitionNavigation.kt` (+12 -10) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/cookieacquisition/CookieAcquisitionScreen.kt` (+11 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/cookieacquisition/CookieAcquisitionViewModel.kt` (+11 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/debugmenu/DebugMenuScreen.kt` (+15 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/debugmenu/DebugMenuViewModel.kt` (+24 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/AuthCallbackViewModelTest.kt` (+28 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/MainViewModelTest.kt` (+47 -2) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/cookieacquisition/CookieAcquisitionScreenTest.kt` (+19 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/cookieacquisition/CookieAcquisitionViewModelTest.kt` (+20 -2) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/debugmenu/DebugMenuViewModelTest.kt` (+27 -0) 📝 `ui/src/main/res/values/strings_non_localized.xml` (+1 -0) </details> ### 📄 Description ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-32122 ## 📔 Objective Add cookie acquisition as a top-level destination in the outer NavHost (alongside root navigation and debug menu) so it can overlay the app without interfering with the state-based navigation in RootNavScreen. MainViewModel monitors the cookie acquisition request flow combined with user/vault state and emits a one-shot NavigateToCookieAcquisition event when conditions are met. Dismissal is handled by the child CookieAcquisitionViewModel via a NavigateBack event (implementing BackgroundEvent to survive Custom Tab lifecycle transitions), which triggers popBackStack through an onDismiss callback. Wire the AuthCallback deeplink so cookie results from the browser are delivered back to the auth repository's cookie callback result flow. Add debug menu controls for triggering cookie acquisition manually during development. ## 🧪 Testing 1. Log in and unlock the vault 2. Open the debug menu and tap "Trigger cookie acquisition" 3. Verify the cookie acquisition screen slides up 4. Tap "Launch browser" — verify custom tab opens 5. Simulate the deeplink callback: `adb shell am start -a android.intent.action.VIEW -d "bitwarden://sso_cookie_vendor?cookie=value&d=1"` — verify the screen auto-dismisses 6. Tap "Continue without syncing" — verify the screen dismisses 7. Tap "Why am I seeing this?" — verify help URL opens ## 📸 Screenshots <video src="https://github.com/user-attachments/assets/19583d35-3807-4dd1-b010-e526e40c514d" width="365" /> --- <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-05-19 20:21:21 -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#81884