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

[PR #5136] [MERGED] [PM-21203] Old user migration login error. #5512

New Issue
Closed
opened 2025-11-27 00:08:31 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-27 00:08:31 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/5136
Author: @andrebispo5
Created: 5/6/2025
Status: ✅ Merged
Merged: 5/7/2025
Merged by: @andrebispo5

Base: main ← Head: pm-21203/user-migration-message

📝 Commits (5)

  • bf8138a [PM-21203] Add localised error message to old user migration login error.
  • dd94598 [PM-21203] Lint
  • b54314a [PM-21203] Fix with PR suggestions
  • 585b6cd Merge branch 'main' into pm-21203/user-migration-message
  • 1a60858 [PM-21203] Fix format

📊 Changes

11 files changed (+473 additions, -3 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt (+5 -1)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/LoginResult.kt (+5 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnViewModel.kt (+17 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginViewModel.kt (+22 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceViewModel.kt (+1 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModel.kt (+2 -1)
📝 app/src/main/res/values/strings.xml (+1 -0)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt (+41 -0)
📝 app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnViewModelTest.kt (+227 -0)
📝 app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginViewModelTest.kt (+141 -0)
📝 network/src/main/kotlin/com/bitwarden/network/model/GetTokenResponseJson.kt (+11 -0)

📄 Description

🎟️ Tracking

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

📔 Objective

When an older user tries to login, the server will return an error message. The app will catch that error and show the user a localised version of that error message.

📸 Screenshots

image

⏰ 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/5136 **Author:** [@andrebispo5](https://github.com/andrebispo5) **Created:** 5/6/2025 **Status:** ✅ Merged **Merged:** 5/7/2025 **Merged by:** [@andrebispo5](https://github.com/andrebispo5) **Base:** `main` ← **Head:** `pm-21203/user-migration-message` --- ### 📝 Commits (5) - [`bf8138a`](https://github.com/bitwarden/android/commit/bf8138adad25cd3003c8730183a5e7b78163fe0f) [PM-21203] Add localised error message to old user migration login error. - [`dd94598`](https://github.com/bitwarden/android/commit/dd9459830687479d0567977e6a17eca0c30a5abd) [PM-21203] Lint - [`b54314a`](https://github.com/bitwarden/android/commit/b54314af766583c291c94c921c14068bdc7670f2) [PM-21203] Fix with PR suggestions - [`585b6cd`](https://github.com/bitwarden/android/commit/585b6cd488aaa6ba951bfe3e8c4f0d41d1b55cff) Merge branch 'main' into pm-21203/user-migration-message - [`1a60858`](https://github.com/bitwarden/android/commit/1a608589d18560e83a9c5ccc75f94f9bb18178fd) [PM-21203] Fix format ### 📊 Changes **11 files changed** (+473 additions, -3 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt` (+5 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/LoginResult.kt` (+5 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnViewModel.kt` (+17 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginViewModel.kt` (+22 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceViewModel.kt` (+1 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModel.kt` (+2 -1) 📝 `app/src/main/res/values/strings.xml` (+1 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt` (+41 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnViewModelTest.kt` (+227 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginViewModelTest.kt` (+141 -0) 📝 `network/src/main/kotlin/com/bitwarden/network/model/GetTokenResponseJson.kt` (+11 -0) </details> ### 📄 Description ## 🎟️ Tracking <!-- Paste the link to the Jira or GitHub issue or otherwise describe / point to where this change is coming from. --> https://bitwarden.atlassian.net/browse/PM-21203 ## 📔 Objective <!-- Describe what the purpose of this PR is, for example what bug you're fixing or new feature you're adding. --> When an older user tries to login, the server will return an error message. The app will catch that error and show the user a localised version of that error message. ## 📸 Screenshots <!-- Required for any UI changes; delete if not applicable. Use fixed width images for better display. --> <img width="252" alt="image" src="https://github.com/user-attachments/assets/4b164494-f943-4d1d-b18c-1f2243f54860" /> ## ⏰ 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 2025-11-27 00:08:31 -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#5512
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?