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

[PR #4508] [MERGED] [PM-8217] New device two factor notice #5003

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

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4508
Author: @andrebispo5
Created: 12/23/2024
Status: ✅ Merged
Merged: 12/27/2024
Merged by: @andrebispo5

Base: main ← Head: pm-8217/new-device-notice-navigation

📝 Commits (10+)

  • 5741333 [PM-8217] New device notice email address access screen, viewmodel and navigation.
  • cb26200 [PM-8217] New device notice email address access tests
  • 35c8b1c Merge branch 'main' into pm-8217/new-device-notice-ui
  • 0c74547 [PM-8217] Fix navigation parameter and ui alignment.
  • 9b20ad6 [PM-8217] Add option to include an icon on the right side of the BitwardenButton
  • e784b85 [PM-8217] Add new device notice two factor screen, viewmodel and navigation.
  • 02803c3 [PM-8217] Remove scroll behaviour. Remove suppression for long method. Add modifier parameter for composables.
  • 58ab96f Merge branch 'main' into pm-8217/new-device-notice-ui
  • ee645b5 [PM-8217] Fixed screen layout
  • c711348 Merge branch 'main' into pm-8217/new-device-notice-ui

📊 Changes

29 files changed (+1345 additions, -53 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSource.kt (+12 -1)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceImpl.kt (+19 -0)
➕ app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/model/NewDeviceNoticeDisplayStatus.kt (+60 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepository.kt (+16 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt (+87 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/platform/manager/model/FlagKey.kt (+20 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/newdevicenotice/NewDeviceNoticeEmailAccessNavigation.kt (+2 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/newdevicenotice/NewDeviceNoticeEmailAccessScreen.kt (+2 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/newdevicenotice/NewDeviceNoticeEmailAccessViewModel.kt (+32 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/newdevicenotice/NewDeviceNoticeTwoFactorNavigation.kt (+2 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/newdevicenotice/NewDeviceNoticeTwoFactorScreen.kt (+43 -10)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/newdevicenotice/NewDeviceNoticeTwoFactorViewModel.kt (+115 -19)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/debugmenu/components/FeatureFlagListItems.kt (+4 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavScreen.kt (+9 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModel.kt (+11 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlocked/VaultUnlockedNavigation.kt (+10 -0)
📝 app/src/main/res/values/strings.xml (+1 -0)
📝 app/src/main/res/values/strings_non_localized.xml (+2 -0)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceTest.kt (+60 -0)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/util/FakeAuthDiskSource.kt (+14 -0)

...and 9 more files

📄 Description

🎟️ Tracking

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

📔 Objective

Adds navigation to the new device two factor notice pages.
Includes logic to have a display status linked to the current user.
Adds and updates tests.
Remind me later button is hidden by permanent feature flag.

Screenshot

Permanent feature flag on:
image

Permanent feature flag off:
image

⏰ 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/4508 **Author:** [@andrebispo5](https://github.com/andrebispo5) **Created:** 12/23/2024 **Status:** ✅ Merged **Merged:** 12/27/2024 **Merged by:** [@andrebispo5](https://github.com/andrebispo5) **Base:** `main` ← **Head:** `pm-8217/new-device-notice-navigation` --- ### 📝 Commits (10+) - [`5741333`](https://github.com/bitwarden/android/commit/57413333fc42ca0cf1cb658030bde4cefbfae0ab) [PM-8217] New device notice email address access screen, viewmodel and navigation. - [`cb26200`](https://github.com/bitwarden/android/commit/cb262005f79e1d4a87278077d10b831115cadb28) [PM-8217] New device notice email address access tests - [`35c8b1c`](https://github.com/bitwarden/android/commit/35c8b1c1ba0bb04107d09a11e92b75af33db9a78) Merge branch 'main' into pm-8217/new-device-notice-ui - [`0c74547`](https://github.com/bitwarden/android/commit/0c74547d962462d6f8debacc354a91ddbd2b4c20) [PM-8217] Fix navigation parameter and ui alignment. - [`9b20ad6`](https://github.com/bitwarden/android/commit/9b20ad61a48da48d0be1a8f81a432f127c46fb2e) [PM-8217] Add option to include an icon on the right side of the BitwardenButton - [`e784b85`](https://github.com/bitwarden/android/commit/e784b85692c2c3bfa02120bc36ffbf5bc818ab67) [PM-8217] Add new device notice two factor screen, viewmodel and navigation. - [`02803c3`](https://github.com/bitwarden/android/commit/02803c3dfd54ea4855148e93745bab0899699b24) [PM-8217] Remove scroll behaviour. Remove suppression for long method. Add modifier parameter for composables. - [`58ab96f`](https://github.com/bitwarden/android/commit/58ab96fe3229287566fd3e995056d5015773de65) Merge branch 'main' into pm-8217/new-device-notice-ui - [`ee645b5`](https://github.com/bitwarden/android/commit/ee645b58ea1c16f87c94b3a1b35161593c54453b) [PM-8217] Fixed screen layout - [`c711348`](https://github.com/bitwarden/android/commit/c711348471e6e57ef0616f743046ee9ae3b3f6bb) Merge branch 'main' into pm-8217/new-device-notice-ui ### 📊 Changes **29 files changed** (+1345 additions, -53 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSource.kt` (+12 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceImpl.kt` (+19 -0) ➕ `app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/model/NewDeviceNoticeDisplayStatus.kt` (+60 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepository.kt` (+16 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt` (+87 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/platform/manager/model/FlagKey.kt` (+20 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/newdevicenotice/NewDeviceNoticeEmailAccessNavigation.kt` (+2 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/newdevicenotice/NewDeviceNoticeEmailAccessScreen.kt` (+2 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/newdevicenotice/NewDeviceNoticeEmailAccessViewModel.kt` (+32 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/newdevicenotice/NewDeviceNoticeTwoFactorNavigation.kt` (+2 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/newdevicenotice/NewDeviceNoticeTwoFactorScreen.kt` (+43 -10) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/newdevicenotice/NewDeviceNoticeTwoFactorViewModel.kt` (+115 -19) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/debugmenu/components/FeatureFlagListItems.kt` (+4 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavScreen.kt` (+9 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModel.kt` (+11 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlocked/VaultUnlockedNavigation.kt` (+10 -0) 📝 `app/src/main/res/values/strings.xml` (+1 -0) 📝 `app/src/main/res/values/strings_non_localized.xml` (+2 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceTest.kt` (+60 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/util/FakeAuthDiskSource.kt` (+14 -0) _...and 9 more files_ </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-8217 ## 📔 Objective <!-- Describe what the purpose of this PR is, for example what bug you're fixing or new feature you're adding. --> Adds navigation to the new device two factor notice pages. Includes logic to have a display status linked to the current user. Adds and updates tests. Remind me later button is hidden by permanent feature flag. ## Screenshot Permanent feature flag on: <img width="251" alt="image" src="https://github.com/user-attachments/assets/206f6d8b-a8ab-40c9-ac17-18bcdf37db26" /> Permanent feature flag off: <img width="249" alt="image" src="https://github.com/user-attachments/assets/eca70e5a-442b-4b6a-ba33-f8356097ae18" /> ## ⏰ 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:52:43 -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#5003
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?