[PR #6472] [MERGED] [PM-30279] Extract credential provider handling to dedicated activity #75138

Closed
opened 2026-05-17 00:32:06 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/6472
Author: @SaintPatrck
Created: 2/3/2026
Status: ✅ Merged
Merged: 2/3/2026
Merged by: @SaintPatrck

Base: main ← Head: PM-30279/extract-credential-activity


📝 Commits (1)

  • c695b28 [PM-30279] Extract credential provider handling to dedicated activity

📊 Changes

16 files changed (+941 additions, -265 deletions)

View changed files

📝 app/src/main/AndroidManifest.xml (+29 -9)
➕ app/src/main/kotlin/com/x8bit/bitwarden/CredentialProviderActivity.kt (+89 -0)
➕ app/src/main/kotlin/com/x8bit/bitwarden/CredentialProviderViewModel.kt (+110 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/MainViewModel.kt (+47 -63)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/di/CredentialProviderModule.kt (+7 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/manager/CredentialManagerPendingIntentManagerImpl.kt (+6 -0)
➕ app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/manager/CredentialProviderRequestManager.kt (+26 -0)
➕ app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/manager/CredentialProviderRequestManagerImpl.kt (+25 -0)
➕ app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/manager/model/CredentialProviderRequest.kt (+39 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt (+5 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt (+5 -0)
➕ app/src/test/kotlin/com/x8bit/bitwarden/CredentialProviderViewModelTest.kt (+353 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/MainViewModelTest.kt (+86 -193)
➕ app/src/test/kotlin/com/x8bit/bitwarden/data/credentials/manager/CredentialProviderRequestManagerTest.kt (+108 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt (+3 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt (+3 -0)

📄 Description

🎟️ Tracking

PM-30279

📔 Objective

This PR extracts credential provider handling into a dedicated CredentialProviderActivity to improve security and architecture. The new activity serves as a transparent trampoline that receives credential intents from the Android CredentialManager framework, securely relays them to MainActivity via CredentialProviderRequestManager, and forwards results back to the framework. This approach hardens against malicious intent attacks by ensuring credential data is never passed through intent extras to exported activities, while preserving the single-Activity architecture where all UI is hosted by MainActivity.

📸 Screenshots

Coming soon!

⏰ 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/6472 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 2/3/2026 **Status:** ✅ Merged **Merged:** 2/3/2026 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `PM-30279/extract-credential-activity` --- ### 📝 Commits (1) - [`c695b28`](https://github.com/bitwarden/android/commit/c695b280384eaadb58d9cbab7c79378d39caf4ce) [PM-30279] Extract credential provider handling to dedicated activity ### 📊 Changes **16 files changed** (+941 additions, -265 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/AndroidManifest.xml` (+29 -9) ➕ `app/src/main/kotlin/com/x8bit/bitwarden/CredentialProviderActivity.kt` (+89 -0) ➕ `app/src/main/kotlin/com/x8bit/bitwarden/CredentialProviderViewModel.kt` (+110 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/MainViewModel.kt` (+47 -63) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/di/CredentialProviderModule.kt` (+7 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/manager/CredentialManagerPendingIntentManagerImpl.kt` (+6 -0) ➕ `app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/manager/CredentialProviderRequestManager.kt` (+26 -0) ➕ `app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/manager/CredentialProviderRequestManagerImpl.kt` (+25 -0) ➕ `app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/manager/model/CredentialProviderRequest.kt` (+39 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt` (+5 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt` (+5 -0) ➕ `app/src/test/kotlin/com/x8bit/bitwarden/CredentialProviderViewModelTest.kt` (+353 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/MainViewModelTest.kt` (+86 -193) ➕ `app/src/test/kotlin/com/x8bit/bitwarden/data/credentials/manager/CredentialProviderRequestManagerTest.kt` (+108 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt` (+3 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt` (+3 -0) </details> ### 📄 Description ## 🎟️ Tracking PM-30279 ## 📔 Objective This PR extracts credential provider handling into a dedicated `CredentialProviderActivity` to improve security and architecture. The new activity serves as a transparent trampoline that receives credential intents from the Android CredentialManager framework, securely relays them to `MainActivity` via `CredentialProviderRequestManager`, and forwards results back to the framework. This approach hardens against malicious intent attacks by ensuring credential data is never passed through intent extras to exported activities, while preserving the single-Activity architecture where all UI is hosted by MainActivity. ## 📸 Screenshots Coming soon! ## ⏰ 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 2026-05-17 00:32:06 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#75138