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 #4042] [MERGED] This PR adds the TOTP matching flow to the app #118532

New Issue
Closed
opened 2026-06-09 14:59:07 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-06-09 14:59:07 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4042
Author: @david-livefront
Created: 10/7/2024
Status: ✅ Merged
Merged: 10/8/2024
Merged by: @david-livefront

Base: main ← Head: PM-13020-PM-13022-PM-13023-PM-13024-PM-13081-PM-13082-PM-13083-totp-matching-flow

📝 Commits (1)

  • 7a809ea This PR adds the TOTP matching flow to the app

📊 Changes

14 files changed (+451 additions, -69 deletions)

View changed files

📝 app/src/main/AndroidManifest.xml (+9 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt (+56 -52)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt (+3 -1)
➕ app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/TotpDataExtensions.kt (+18 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingContent.kt (+18 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreen.kt (+13 -3)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt (+47 -5)
📝 app/src/main/res/values/strings.xml (+1 -0)
📝 app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt (+67 -1)
📝 app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensionsTest.kt (+65 -0)
➕ app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/TotpDataExtensionsTest.kt (+48 -0)
📝 app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt (+23 -1)
📝 app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt (+77 -1)
📝 app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataUtil.kt (+6 -5)

📄 Description

🎟️ Tracking

PM-13020
PM-13022
PM-13023
PM-13024
PM-13081
PM-13082
PM-13083

📔 Objective

This PR updates the VaultItemListingScreen and VaultAddEditScreen to support a totp special circumstance.

📸 Screenshots

## 📋 Pull Request Information **Original PR:** https://github.com/bitwarden/android/pull/4042 **Author:** [@david-livefront](https://github.com/david-livefront) **Created:** 10/7/2024 **Status:** ✅ Merged **Merged:** 10/8/2024 **Merged by:** [@david-livefront](https://github.com/david-livefront) **Base:** `main` ← **Head:** `PM-13020-PM-13022-PM-13023-PM-13024-PM-13081-PM-13082-PM-13083-totp-matching-flow` --- ### 📝 Commits (1) - [`7a809ea`](https://github.com/bitwarden/android/commit/7a809ea2689d1c14c855871b7b4c9c7c2e46ba2e) This PR adds the TOTP matching flow to the app ### 📊 Changes **14 files changed** (+451 additions, -69 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/AndroidManifest.xml` (+9 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt` (+56 -52) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt` (+3 -1) ➕ `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/TotpDataExtensions.kt` (+18 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingContent.kt` (+18 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreen.kt` (+13 -3) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt` (+47 -5) 📝 `app/src/main/res/values/strings.xml` (+1 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt` (+67 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensionsTest.kt` (+65 -0) ➕ `app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/TotpDataExtensionsTest.kt` (+48 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt` (+23 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt` (+77 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataUtil.kt` (+6 -5) </details> ### 📄 Description ## 🎟️ Tracking [PM-13020](https://bitwarden.atlassian.net/browse/PM-13020) [PM-13022](https://bitwarden.atlassian.net/browse/PM-13022) [PM-13023](https://bitwarden.atlassian.net/browse/PM-13023) [PM-13024](https://bitwarden.atlassian.net/browse/PM-13024) [PM-13081](https://bitwarden.atlassian.net/browse/PM-13081) [PM-13082](https://bitwarden.atlassian.net/browse/PM-13082) [PM-13083](https://bitwarden.atlassian.net/browse/PM-13083) ## 📔 Objective This PR updates the `VaultItemListingScreen` and `VaultAddEditScreen` to support a totp special circumstance. ## 📸 Screenshots <video src="https://github.com/user-attachments/assets/e556a466-a7aa-40e5-ba0c-f0d0f77d2ccd" width="300" /> ## ⏰ 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 [PM-13020]: https://bitwarden.atlassian.net/browse/PM-13020?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [PM-13022]: https://bitwarden.atlassian.net/browse/PM-13022?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [PM-13023]: https://bitwarden.atlassian.net/browse/PM-13023?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [PM-13024]: https://bitwarden.atlassian.net/browse/PM-13024?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [PM-13081]: https://bitwarden.atlassian.net/browse/PM-13081?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [PM-13082]: https://bitwarden.atlassian.net/browse/PM-13082?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [PM-13083]: https://bitwarden.atlassian.net/browse/PM-13083?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ --- <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-06-09 14:59:07 -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#118532
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?