github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-05-08 21:10:40 -05:00
Code Issues 1.1k Packages Projects Releases 122 Wiki Activity

[PR #5915] [MERGED] [PM-25825] Add ImportItems navigation #47750

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

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/5915
Author: @SaintPatrck
Created: 9/19/2025
Status: ✅ Merged
Merged: 9/22/2025
Merged by: @SaintPatrck

Base: main ← Head: cxf/app/import-logins-navigation

📝 Commits (10+)

  • f8277f2 Add ImportItems navigation
  • 6e0835c Testing 123
  • 9243f78 Testing 456
  • 77ee206 Refactor: Remove direct navigation to My Vault and Import Items from Vault screen
  • de96c0e Merge remote-tracking branch 'origin/main' into cxf/app/import-logins-navigation
  • 98ea780 Refactor import logins navigation
  • eed0270 Rename ImportItemsGraphRoute to ImportItemsRoute
  • c740b1d Remove unused NavHostController import
  • e2efd6f Refactor ImportItemsViewModel to remove SnackbarRelayManager
  • e148b1e Update import items navigation based on feature flag

📊 Changes

16 files changed (+336 additions, -114 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsNavigation.kt (+7 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/vault/VaultSettingsNavigation.kt (+2 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/vault/VaultSettingsScreen.kt (+2 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/vault/VaultSettingsViewModel.kt (+13 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarNavigation.kt (+1 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarScreen.kt (+2 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/manager/snackbar/SnackbarRelay.kt (+0 -1)
➕ app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/importitems/ImportItemsNavigation.kt (+40 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/importitems/ImportItemsScreen.kt (+22 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/importitems/ImportItemsViewModel.kt (+106 -45)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/importitems/handlers/ImportItemsHandler.kt (+6 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt (+0 -1)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/vault/VaultSettingsScreenTest.kt (+2 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/vault/VaultSettingsViewModelTest.kt (+35 -9)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/importitems/ImportItemsScreenTest.kt (+1 -9)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/importitems/ImportItemsViewModelTest.kt (+97 -44)

📄 Description

🎟️ Tracking

PM-25825

📔 Objective

Implement navigation for the Import items screen.

Upon completion of the import process a Snackbar or Dialog is displayed to inform the user of the result.

If the import and re-sync is successful a Snackbar is displayed, informing the user how many items were imported.

If the import is successful but sync fails, a Snackbar is displayed, along with an option to retry sync.

If the import process cannot complete, a dialog is displayed prompting the user to try again or contact support.

Additionally, the VAULT_SYNC_FAILED Snackbar relay has been removed as it is no longer necessary.

📸 Screenshots

## 📋 Pull Request Information **Original PR:** https://github.com/bitwarden/android/pull/5915 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 9/19/2025 **Status:** ✅ Merged **Merged:** 9/22/2025 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `cxf/app/import-logins-navigation` --- ### 📝 Commits (10+) - [`f8277f2`](https://github.com/bitwarden/android/commit/f8277f2d4258e6d48899ab8c1812ab15ccf272f1) Add ImportItems navigation - [`6e0835c`](https://github.com/bitwarden/android/commit/6e0835c6ce78d2fba992f70e47fa90bd937e9f6e) Testing 123 - [`9243f78`](https://github.com/bitwarden/android/commit/9243f78295376c21ab649a8fc682921e1eac12dd) Testing 456 - [`77ee206`](https://github.com/bitwarden/android/commit/77ee20678e6acf5dd80628b51adf084e565c6577) Refactor: Remove direct navigation to My Vault and Import Items from Vault screen - [`de96c0e`](https://github.com/bitwarden/android/commit/de96c0eff52c8877f906ea8c1bec9812d4de9e61) Merge remote-tracking branch 'origin/main' into cxf/app/import-logins-navigation - [`98ea780`](https://github.com/bitwarden/android/commit/98ea780f8227d65a7b529b28397f0fd312fff93b) Refactor import logins navigation - [`eed0270`](https://github.com/bitwarden/android/commit/eed0270f6306c05bcbb4998ceb30e1fdfbbd54c1) Rename ImportItemsGraphRoute to ImportItemsRoute - [`c740b1d`](https://github.com/bitwarden/android/commit/c740b1dd77ae651ab7d8a499f17393d9b0f96b18) Remove unused NavHostController import - [`e2efd6f`](https://github.com/bitwarden/android/commit/e2efd6f9c05cc7ff08800eabaa1757b2ec0e181b) Refactor ImportItemsViewModel to remove SnackbarRelayManager - [`e148b1e`](https://github.com/bitwarden/android/commit/e148b1ebbdfa960e2fb000dc006fabee662a60d3) Update import items navigation based on feature flag ### 📊 Changes **16 files changed** (+336 additions, -114 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsNavigation.kt` (+7 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/vault/VaultSettingsNavigation.kt` (+2 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/vault/VaultSettingsScreen.kt` (+2 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/vault/VaultSettingsViewModel.kt` (+13 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarNavigation.kt` (+1 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarScreen.kt` (+2 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/manager/snackbar/SnackbarRelay.kt` (+0 -1) ➕ `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/importitems/ImportItemsNavigation.kt` (+40 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/importitems/ImportItemsScreen.kt` (+22 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/importitems/ImportItemsViewModel.kt` (+106 -45) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/importitems/handlers/ImportItemsHandler.kt` (+6 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt` (+0 -1) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/vault/VaultSettingsScreenTest.kt` (+2 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/vault/VaultSettingsViewModelTest.kt` (+35 -9) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/importitems/ImportItemsScreenTest.kt` (+1 -9) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/importitems/ImportItemsViewModelTest.kt` (+97 -44) </details> ### 📄 Description ## 🎟️ Tracking PM-25825 ## 📔 Objective Implement navigation for the Import items screen. Upon completion of the import process a Snackbar or Dialog is displayed to inform the user of the result. If the import and re-sync is successful a Snackbar is displayed, informing the user how many items were imported. If the import is successful but sync fails, a Snackbar is displayed, along with an option to retry sync. If the import process cannot complete, a dialog is displayed prompting the user to try again or contact support. Additionally, the `VAULT_SYNC_FAILED` Snackbar relay has been removed as it is no longer necessary. ## 📸 Screenshots <video src="https://github.com/user-attachments/assets/9765eefa-03b9-407f-808b-4619bc191e11" width="365" /> ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Protected functional changes with optionality (feature flags) - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team ## 🦮 Reviewer guidelines <!-- Suggested interactions but feel free to use (or not) as you desire! --> - 👍 (`:+1:`) or similar for great changes - 📝 (`:memo:`) or ℹ️ (`:information_source:`) for notes or general info - ❓ (`:question:`) for questions - 🤔 (`:thinking:`) or 💭 (`:thought_balloon:`) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion - 🎨 (`:art:`) for suggestions / improvements - ❌ (`:x:`) or ⚠️ (`:warning:`) for more significant problems or concerns needing attention - 🌱 (`:seedling:`) or ♻️ (`:recycle:`) for future improvements or indications of technical debt - ⛏ (`:pick:`) for minor or nitpick changes --- <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-26 15:18:35 -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#47750
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?