github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-06-10 00:28:29 -05:00
Code Issues 2.2k Packages Projects Releases 127 Wiki Activity

[PR #2515] [MERGED] [PM-1748] Fix Watch TOTP details on Always On Display #96992

New Issue
Closed
opened 2026-05-30 21:17:28 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-05-30 21:17:28 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/2515
Author: @fedemkr
Created: 5/8/2023
Status: ✅ Merged
Merged: 5/10/2023
Merged by: @fedemkr

Base: master ← Head: PM-1748-fix-always-on-display-watch-totp

📝 Commits (4)

  • 9bbff14 PM-1748 Fix watchOS issue where the TOTP code wasn't being regenerated after always on display. Also, blurred totp code and timer value when entering in Always On Display
  • 3c55f38 Fixed PR labeler for WatchOS changes
  • 0b2c7f8 PM-1748 watchOS made username privacy sensitive for always on display
  • 479df68 Revert "Fixed PR labeler for WatchOS changes"

📊 Changes

5 files changed (+26 additions, -11 deletions)

View changed files

📝 src/watchOS/bitwarden/bitwarden WatchKit Extension/Models/Mocks/CipherMock.swift (+1 -1)
📝 src/watchOS/bitwarden/bitwarden WatchKit Extension/ViewModels/CipherDetailsViewModel.swift (+14 -10)
📝 src/watchOS/bitwarden/bitwarden WatchKit Extension/Views/CipherDetailsView.swift (+9 -0)
📝 src/watchOS/bitwarden/bitwarden WatchKit Extension/Views/CipherItemView.swift (+1 -0)
📝 src/watchOS/bitwarden/bitwarden WatchKit Extension/Views/CipherListView.swift (+1 -0)

📄 Description

Type of change

  • Bug fix
  • New feature development
  • Tech debt (refactoring, code cleanup, dependency upgrades, etc)
  • Build/deploy pipeline (DevOps)
  • Other

Objective

Fix TOTP code regeneration after Always On Display. Also, blur username, TOTP code and timer when entering in Always On Display.

Code changes

  • CipherDetailsViewModel: Extracted the generation of the code to a specific method so that it can be reused.
  • CipherDetailsView: Regenerates the code when the view becomes active (after coming from background/always on display) and also marked the username, TOTP code and timer value as sensitive so they are blurred when entering into Always On Display.
  • CipherListView: Blur username on Always On Display
  • CipherItemView: Blur username on Always On Display

Screenshots

TOTP List Always On Display TOTP Details Always On Display

Before you submit

  • Please check for formatting errors (dotnet format --verify-no-changes) (required)
  • Please add unit tests where it makes sense to do so (encouraged but not required)
  • If this change requires a documentation update - notify the documentation team
  • If this change has particular deployment requirements - notify the DevOps team

🔄 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/2515 **Author:** [@fedemkr](https://github.com/fedemkr) **Created:** 5/8/2023 **Status:** ✅ Merged **Merged:** 5/10/2023 **Merged by:** [@fedemkr](https://github.com/fedemkr) **Base:** `master` ← **Head:** `PM-1748-fix-always-on-display-watch-totp` --- ### 📝 Commits (4) - [`9bbff14`](https://github.com/bitwarden/android/commit/9bbff141acc7f87d096800bd8b3fb4a2fa62374b) PM-1748 Fix watchOS issue where the TOTP code wasn't being regenerated after always on display. Also, blurred totp code and timer value when entering in Always On Display - [`3c55f38`](https://github.com/bitwarden/android/commit/3c55f380696ee0d6a6a363bcf4603bdae59c7d19) Fixed PR labeler for WatchOS changes - [`0b2c7f8`](https://github.com/bitwarden/android/commit/0b2c7f8bfb037ba13019982b00c6d5760a477bc0) PM-1748 watchOS made username privacy sensitive for always on display - [`479df68`](https://github.com/bitwarden/android/commit/479df68cf731bde6a9802ebd90916ce56f946d58) Revert "Fixed PR labeler for WatchOS changes" ### 📊 Changes **5 files changed** (+26 additions, -11 deletions) <details> <summary>View changed files</summary> 📝 `src/watchOS/bitwarden/bitwarden WatchKit Extension/Models/Mocks/CipherMock.swift` (+1 -1) 📝 `src/watchOS/bitwarden/bitwarden WatchKit Extension/ViewModels/CipherDetailsViewModel.swift` (+14 -10) 📝 `src/watchOS/bitwarden/bitwarden WatchKit Extension/Views/CipherDetailsView.swift` (+9 -0) 📝 `src/watchOS/bitwarden/bitwarden WatchKit Extension/Views/CipherItemView.swift` (+1 -0) 📝 `src/watchOS/bitwarden/bitwarden WatchKit Extension/Views/CipherListView.swift` (+1 -0) </details> ### 📄 Description ## Type of change - [X] Bug fix - [ ] New feature development - [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc) - [ ] Build/deploy pipeline (DevOps) - [ ] Other ## Objective <!--Describe what the purpose of this PR is. For example: what bug you're fixing or what new feature you're adding--> Fix TOTP code regeneration after Always On Display. Also, blur username, TOTP code and timer when entering in Always On Display. ## Code changes <!--Explain the changes you've made to each file or major component. This should help the reviewer understand your changes--> <!--Also refer to any related changes or PRs in other repositories--> * **CipherDetailsViewModel:** Extracted the generation of the code to a specific method so that it can be reused. * **CipherDetailsView:** Regenerates the code when the view becomes active (after coming from background/always on display) and also marked the username, TOTP code and timer value as sensitive so they are blurred when entering into Always On Display. * **CipherListView:** Blur username on Always On Display * **CipherItemView:** Blur username on Always On Display ## Screenshots <!--Required for any UI changes. Delete if not applicable--> <img width="258" alt="TOTP List Always On Display" src="https://github.com/bitwarden/mobile/assets/15682323/1681baa6-b976-42f8-9a04-6e46883e1d14"> <img width="273" alt="TOTP Details Always On Display" src="https://github.com/bitwarden/mobile/assets/15682323/5187e965-3ae5-43e9-a6c4-77a08892c277"> ## Before you submit - Please check for formatting errors (`dotnet format --verify-no-changes`) (required) - Please add **unit tests** where it makes sense to do so (encouraged but not required) - If this change requires a **documentation update** - notify the documentation team - If this change has particular **deployment requirements** - notify the DevOps team --- <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-05-30 21:17:28 -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#96992
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?