[PR #5111] [MERGED] [PM-17686] Allow overwriting TLS certificates #5491

Closed
opened 2025-11-27 00:05:18 -06:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/5111
Author: @SaintPatrck
Created: 4/28/2025
Status: Merged
Merged: 4/28/2025
Merged by: @SaintPatrck

Base: mainHead: PM-17686/duplicate-cert-alias-handling


📝 Commits (1)

  • ea85cc9 [PM-17686] Allow overwriting TLS certificates

📊 Changes

9 files changed (+410 additions, -89 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/data/platform/manager/CertificateManager.kt (+5 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/platform/manager/CertificateManagerImpl.kt (+3 -4)
📝 app/src/main/java/com/x8bit/bitwarden/data/platform/manager/model/ImportPrivateKeyResult.kt (+0 -7)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentScreen.kt (+28 -3)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentViewModel.kt (+111 -26)
📝 app/src/main/res/values/strings.xml (+4 -0)
📝 app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/ssl/CertificateManagerTest.kt (+11 -36)
📝 app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentScreenTest.kt (+106 -1)
📝 app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentViewModelTest.kt (+142 -12)

📄 Description

🎟️ Tracking

PM-17686

📔 Objective

When a certificate alias already exists, the app now displays a confirmation dialog to allow the user to overwrite the existing certificate.

📸 Screenshots

image

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/5111 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 4/28/2025 **Status:** ✅ Merged **Merged:** 4/28/2025 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `PM-17686/duplicate-cert-alias-handling` --- ### 📝 Commits (1) - [`ea85cc9`](https://github.com/bitwarden/android/commit/ea85cc9d03a3bce09fec58ea7b673945bb35674c) [PM-17686] Allow overwriting TLS certificates ### 📊 Changes **9 files changed** (+410 additions, -89 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/data/platform/manager/CertificateManager.kt` (+5 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/platform/manager/CertificateManagerImpl.kt` (+3 -4) 📝 `app/src/main/java/com/x8bit/bitwarden/data/platform/manager/model/ImportPrivateKeyResult.kt` (+0 -7) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentScreen.kt` (+28 -3) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentViewModel.kt` (+111 -26) 📝 `app/src/main/res/values/strings.xml` (+4 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/ssl/CertificateManagerTest.kt` (+11 -36) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentScreenTest.kt` (+106 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentViewModelTest.kt` (+142 -12) </details> ### 📄 Description ## 🎟️ Tracking PM-17686 ## 📔 Objective When a certificate alias already exists, the app now displays a confirmation dialog to allow the user to overwrite the existing certificate. ## 📸 Screenshots <img width="413" alt="image" src="https://github.com/user-attachments/assets/f16da68f-902f-442d-b3a6-3c6538d2a0fd" /> ## ⏰ 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 2025-11-27 00:05:18 -06:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#5491