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 #6393] [MERGED] [PM-28990] Skipping vault migration on Network or Timeout error #19298

New Issue
Closed
opened 2026-04-15 03:44:39 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-15 03:44:39 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/6393
Author: @aj-rosado
Created: 1/22/2026
Status: ✅ Merged
Merged: 1/23/2026
Merged by: @aj-rosado

Base: main ← Head: PM-28990/no-network-when-migrating

📝 Commits (3)

  • 52776e8 Added error message for when user has no NetworkConnection or Timeout when migrating that clears the migration
  • fc5ba31 Added NoNetwork dialog on LeaveOrganization and MigrateToMyItems
  • f4d7f4e improved code readibility

📊 Changes

11 files changed (+322 additions, -37 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/leaveorganization/LeaveOrganizationScreen.kt (+12 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/leaveorganization/LeaveOrganizationViewModel.kt (+51 -7)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/leaveorganization/handlers/LeaveOrganizationHandler.kt (+4 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/migratetomyitems/MigrateToMyItemsScreen.kt (+11 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/migratetomyitems/MigrateToMyItemsViewModel.kt (+53 -8)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/migratetomyitems/handler/MigrateToMyItemsHandler.kt (+4 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/leaveorganization/LeaveOrganizationScreenTest.kt (+3 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/leaveorganization/LeaveOrganizationViewModelTest.kt (+69 -17)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/migratetomyitems/MigrateToMyItemsViewModelTest.kt (+80 -4)
📝 network/src/main/kotlin/com/bitwarden/network/util/NetworkUtils.kt (+9 -0)
📝 network/src/test/kotlin/com/bitwarden/network/util/NetworkUtilsTest.kt (+26 -0)

📄 Description

🎟️ Tracking

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

📔 Objective

On the unlikely scenario of an user seeing the VaultMigration screen and cannot migrate the items due to connectivity issues (NoConnection or timeout).
User will be shown an error message and skip the migration for now.

📸 Screenshots

Leave organization screen displaying no connection error Migrate Vault To My Items screen displaying no connection error

⏰ 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

  • 👍 (:+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

🔄 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/6393 **Author:** [@aj-rosado](https://github.com/aj-rosado) **Created:** 1/22/2026 **Status:** ✅ Merged **Merged:** 1/23/2026 **Merged by:** [@aj-rosado](https://github.com/aj-rosado) **Base:** `main` ← **Head:** `PM-28990/no-network-when-migrating` --- ### 📝 Commits (3) - [`52776e8`](https://github.com/bitwarden/android/commit/52776e82abeca6eccbdf60bc5ec17d1fd6e482bf) Added error message for when user has no NetworkConnection or Timeout when migrating that clears the migration - [`fc5ba31`](https://github.com/bitwarden/android/commit/fc5ba31f190a4f53758605985b52a92917f8c9a5) Added NoNetwork dialog on LeaveOrganization and MigrateToMyItems - [`f4d7f4e`](https://github.com/bitwarden/android/commit/f4d7f4e3346daaa1ea72b916fafcc5693cfd3a53) improved code readibility ### 📊 Changes **11 files changed** (+322 additions, -37 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/leaveorganization/LeaveOrganizationScreen.kt` (+12 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/leaveorganization/LeaveOrganizationViewModel.kt` (+51 -7) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/leaveorganization/handlers/LeaveOrganizationHandler.kt` (+4 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/migratetomyitems/MigrateToMyItemsScreen.kt` (+11 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/migratetomyitems/MigrateToMyItemsViewModel.kt` (+53 -8) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/migratetomyitems/handler/MigrateToMyItemsHandler.kt` (+4 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/leaveorganization/LeaveOrganizationScreenTest.kt` (+3 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/leaveorganization/LeaveOrganizationViewModelTest.kt` (+69 -17) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/migratetomyitems/MigrateToMyItemsViewModelTest.kt` (+80 -4) 📝 `network/src/main/kotlin/com/bitwarden/network/util/NetworkUtils.kt` (+9 -0) 📝 `network/src/test/kotlin/com/bitwarden/network/util/NetworkUtilsTest.kt` (+26 -0) </details> ### 📄 Description ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-28990 ## 📔 Objective On the unlikely scenario of an user seeing the VaultMigration screen and cannot migrate the items due to connectivity issues (NoConnection or timeout). User will be shown an error message and skip the migration for now. ## 📸 Screenshots <img width="230" height="2400" alt="Leave organization screen displaying no connection error" src="https://github.com/user-attachments/assets/1fff2730-8fdf-472f-bb39-f1328e1a8960" /> <img width="230" height="2400" alt="Migrate Vault To My Items screen displaying no connection error" src="https://github.com/user-attachments/assets/d3ab0fed-5b59-48ae-bec6-cbbe9e995ccc" /> ## ⏰ 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-15 03:44:39 -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#19298
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?