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 #4633] [MERGED] Reverts PM-14995 #5087

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

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4633
Author: @dseverns-livefront
Created: 1/27/2025
Status: ✅ Merged
Merged: 1/27/2025
Merged by: @dseverns-livefront

Base: release/2025.01-rc15 ← Head: PM-14495-revert

📝 Commits (2)

  • afd5fa9 Revert "PM-14995 Hide TOTP for non premium org items even if individual user has premium account (#4390)"
  • 52997d0 fix test

📊 Changes

39 files changed (+56 additions, -320 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/Organization.kt (+0 -1)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensions.kt (+0 -1)
📝 app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillTotpManagerImpl.kt (+1 -9)
📝 app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerImpl.kt (+0 -1)
📝 app/src/main/java/com/x8bit/bitwarden/data/vault/manager/model/VerificationCodeItem.kt (+0 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt (+0 -6)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensions.kt (+1 -5)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt (+10 -15)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt (+1 -7)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt (+1 -5)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt (+0 -8)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/UserStateExtensions.kt (+0 -8)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensions.kt (+8 -19)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModel.kt (+1 -5)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt (+0 -3)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/AuthDiskSourceExtensionsTest.kt (+0 -6)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensionsTest.kt (+0 -3)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensionsTest.kt (+0 -16)
📝 app/src/test/java/com/x8bit/bitwarden/data/autofill/manager/AutofillTotpManagerTest.kt (+0 -35)
📝 app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CipherViewUtil.kt (+2 -4)

...and 19 more files

📄 Description

🎟️ Tracking

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

📔 Objective

⏰ 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/4633 **Author:** [@dseverns-livefront](https://github.com/dseverns-livefront) **Created:** 1/27/2025 **Status:** ✅ Merged **Merged:** 1/27/2025 **Merged by:** [@dseverns-livefront](https://github.com/dseverns-livefront) **Base:** `release/2025.01-rc15` ← **Head:** `PM-14495-revert` --- ### 📝 Commits (2) - [`afd5fa9`](https://github.com/bitwarden/android/commit/afd5fa9e06e5254149d9dd47a6861837bc4940f4) Revert "PM-14995 Hide TOTP for non premium org items even if individual user has premium account (#4390)" - [`52997d0`](https://github.com/bitwarden/android/commit/52997d08aa408ddff7bee29396af9a2df350c2b4) fix test ### 📊 Changes **39 files changed** (+56 additions, -320 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/Organization.kt` (+0 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensions.kt` (+0 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillTotpManagerImpl.kt` (+1 -9) 📝 `app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerImpl.kt` (+0 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/data/vault/manager/model/VerificationCodeItem.kt` (+0 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt` (+0 -6) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensions.kt` (+1 -5) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt` (+10 -15) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt` (+1 -7) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt` (+1 -5) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt` (+0 -8) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/UserStateExtensions.kt` (+0 -8) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensions.kt` (+8 -19) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModel.kt` (+1 -5) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt` (+0 -3) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/AuthDiskSourceExtensionsTest.kt` (+0 -6) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensionsTest.kt` (+0 -3) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensionsTest.kt` (+0 -16) 📝 `app/src/test/java/com/x8bit/bitwarden/data/autofill/manager/AutofillTotpManagerTest.kt` (+0 -35) 📝 `app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CipherViewUtil.kt` (+2 -4) _...and 19 more files_ </details> ### 📄 Description ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-14995 <!-- Paste the link to the Jira or GitHub issue or otherwise describe / point to where this change is coming from. --> ## 📔 Objective - revert no longer needed changes from https://github.com/bitwarden/android/pull/4390 <!-- 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:53:49 -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#5087
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?