github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-03-12 05:04:17 -05:00
Code Issues 144 Packages Projects Releases 116 Wiki Activity

[PR #4439] [MERGED] PM-15624 🍒 Align handling of no network states with iOS app. (#4431) #4946

New Issue
Closed
opened 2025-11-26 23:51:54 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-26 23:51:54 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4439
Author: @dseverns-livefront
Created: 12/9/2024
Status: ✅ Merged
Merged: 12/9/2024
Merged by: @dseverns-livefront

Base: release/hotfix-v2024.11.7 ← Head: PM-15624-nonetwork-hotfix

📝 Commits (1)

  • 723de78 PM-15624 Align handling of no network states with iOS app. (#4431)

📊 Changes

11 files changed (+222 additions, -107 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/other/OtherScreen.kt (+14 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/other/OtherViewModel.kt (+39 -3)
📝 app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModel.kt (+7 -20)
📝 app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModel.kt (+13 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt (+30 -17)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt (+25 -13)
📝 app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/other/OtherViewModelTest.kt (+25 -0)
📝 app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModelTest.kt (+4 -10)
📝 app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModelTest.kt (+44 -0)
📝 app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt (+11 -3)
📝 app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModelTest.kt (+10 -41)

📄 Description

(cherry picked from commit 7b7c2da67c)

🎟️ Tracking

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

📔 Objective

  • Cherry pick into hotfix branch

⏰ Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation 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/4439 **Author:** [@dseverns-livefront](https://github.com/dseverns-livefront) **Created:** 12/9/2024 **Status:** ✅ Merged **Merged:** 12/9/2024 **Merged by:** [@dseverns-livefront](https://github.com/dseverns-livefront) **Base:** `release/hotfix-v2024.11.7` ← **Head:** `PM-15624-nonetwork-hotfix` --- ### 📝 Commits (1) - [`723de78`](https://github.com/bitwarden/android/commit/723de78b00d3031ddb3dfc12fedbff624bc4027c) PM-15624 Align handling of no network states with iOS app. (#4431) ### 📊 Changes **11 files changed** (+222 additions, -107 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/other/OtherScreen.kt` (+14 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/other/OtherViewModel.kt` (+39 -3) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModel.kt` (+7 -20) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModel.kt` (+13 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt` (+30 -17) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt` (+25 -13) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/other/OtherViewModelTest.kt` (+25 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModelTest.kt` (+4 -10) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModelTest.kt` (+44 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt` (+11 -3) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModelTest.kt` (+10 -41) </details> ### 📄 Description (cherry picked from commit 7b7c2da67c1a0edb4636223737266128bff7ed3d) ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-15624 <!-- Paste the link to the Jira or GitHub issue or otherwise describe / point to where this change is coming from. --> ## 📔 Objective - Cherry pick into hotfix branch <!-- Describe what the purpose of this PR is, for example what bug you're fixing or new feature you're adding. --> <!-- Required for any UI changes; delete if not applicable. Use fixed width images for better display. --> ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation 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 2025-11-26 23:51:54 -06: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#4946
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?