[PR #4708] [MERGED] [PM-14936] Add AnonAddy self-hosted server URL support #5146

Closed
opened 2025-11-26 23:54:39 -06:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4708
Author: @SaintPatrck
Created: 2/10/2025
Status: Merged
Merged: 2/18/2025
Merged by: @SaintPatrck

Base: mainHead: PM-14936/gen-email_anonaddy-base-url


📝 Commits (10+)

  • 8269e35 PM-14936 Add AnonAddy self-hosted server URL support
  • 33d308c Merge branch 'main' into PM-14936/gen-email_anonaddy-base-url
  • 8d132b5 Remove duplicate string resource
  • c6fcc61 Remove unnecessary parameter from toServiceType function
  • 3f80a9f Merge remote-tracking branch 'origin/main' into PM-14936/gen-email_anonaddy-base-url
  • d271c0a Increase test coverage
  • ee35df9 Fix test
  • 4c3f22f Merge remote-tracking branch 'origin/main' into PM-14936/gen-email_anonaddy-base-url
  • fcbda1b Add https prefix to self-hosted server URLs and remove unused code
  • 402dd85 Remove internal from selfHostServerUrl in AddyIo data class

📊 Changes

12 files changed (+454 additions, -45 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/model/UsernameGenerationOptions.kt (+4 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/StringExtensions.kt (+7 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt (+20 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModel.kt (+92 -5)
📝 app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/handlers/ForwardedEmailAliasHandlers.kt (+7 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/util/ForwardedEmailServiceTypeExtensions.kt (+4 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/util/ServiceTypeExtensions.kt (+11 -2)
📝 app/src/main/res/values/strings.xml (+1 -0)
📝 app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreenTest.kt (+80 -0)
📝 app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModelTest.kt (+62 -8)
📝 app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/util/ForwardedEmailServiceTypeExtensionsTest.kt (+65 -10)
📝 app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/util/ServiceTypeExtensionsTest.kt (+101 -20)

📄 Description

🎟️ Tracking

PM-3553
PM-14936
PM-7430

Resolves https://github.com/bitwarden/server/pull/5387
Resolves #3152
Relates to #4308

📔 Objective

Support self-hosted AnonAddy server URLs in the username generator.

When the feature flag, AnonAddySelfHostAlias, is enabled users can enter the server URL for their self-hosted AnonAddy instance. When disabled, the default cloud URL is used.

Self-hosted server URL is persisted with the other service type options.

Moved prefixHttpsIfNecessaryOrNull to StringExtensions.

📸 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
  • 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/4708 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 2/10/2025 **Status:** ✅ Merged **Merged:** 2/18/2025 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `PM-14936/gen-email_anonaddy-base-url` --- ### 📝 Commits (10+) - [`8269e35`](https://github.com/bitwarden/android/commit/8269e35838a7c81bf44b6f93b1eebde9b4c303ee) [PM-14936] Add AnonAddy self-hosted server URL support - [`33d308c`](https://github.com/bitwarden/android/commit/33d308ca368b4d3ecdc10960e490309eeea743d1) Merge branch 'main' into PM-14936/gen-email_anonaddy-base-url - [`8d132b5`](https://github.com/bitwarden/android/commit/8d132b5fd718d8c0790797afd2f91b09faa594bb) Remove duplicate string resource - [`c6fcc61`](https://github.com/bitwarden/android/commit/c6fcc61681b9f2b80744aaebbb4dea2c2ed92a7a) Remove unnecessary parameter from `toServiceType` function - [`3f80a9f`](https://github.com/bitwarden/android/commit/3f80a9f69416110e5da92f1fe7b1da082ad55971) Merge remote-tracking branch 'origin/main' into PM-14936/gen-email_anonaddy-base-url - [`d271c0a`](https://github.com/bitwarden/android/commit/d271c0a3cdcf9924b4980251547da6b2f2149737) Increase test coverage - [`ee35df9`](https://github.com/bitwarden/android/commit/ee35df969d0960399cacc7d9e5ad6cc3fe1f0e3e) Fix test - [`4c3f22f`](https://github.com/bitwarden/android/commit/4c3f22f21374f6f5424ba81f6ea4f544e27e9478) Merge remote-tracking branch 'origin/main' into PM-14936/gen-email_anonaddy-base-url - [`fcbda1b`](https://github.com/bitwarden/android/commit/fcbda1bb4345eadf150017e57554fb8fc92b9cb0) Add https prefix to self-hosted server URLs and remove unused code - [`402dd85`](https://github.com/bitwarden/android/commit/402dd85eb747ac2f8a42c54d62315a26c50ff04d) Remove `internal` from `selfHostServerUrl` in `AddyIo` data class ### 📊 Changes **12 files changed** (+454 additions, -45 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/model/UsernameGenerationOptions.kt` (+4 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/StringExtensions.kt` (+7 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt` (+20 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModel.kt` (+92 -5) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/handlers/ForwardedEmailAliasHandlers.kt` (+7 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/util/ForwardedEmailServiceTypeExtensions.kt` (+4 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/util/ServiceTypeExtensions.kt` (+11 -2) 📝 `app/src/main/res/values/strings.xml` (+1 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreenTest.kt` (+80 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModelTest.kt` (+62 -8) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/util/ForwardedEmailServiceTypeExtensionsTest.kt` (+65 -10) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/util/ServiceTypeExtensionsTest.kt` (+101 -20) </details> ### 📄 Description ## 🎟️ Tracking [PM-3553](https://bitwarden.atlassian.net/browse/PM-3553) [PM-14936](https://bitwarden.atlassian.net/browse/PM-14936) [PM-7430](https://bitwarden.atlassian.net/browse/PM-7430) Resolves https://github.com/bitwarden/server/pull/5387 Resolves #3152 Relates to #4308 ## 📔 Objective Support self-hosted AnonAddy server URLs in the username generator. When the feature flag, `AnonAddySelfHostAlias`, is enabled users can enter the server URL for their self-hosted AnonAddy instance. When disabled, the default cloud URL is used. Self-hosted server URL is persisted with the other service type options. Moved `prefixHttpsIfNecessaryOrNull` to `StringExtensions`. ## 📸 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 - 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-14936]: https://bitwarden.atlassian.net/browse/PM-14936?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [PM-3503]: https://bitwarden.atlassian.net/browse/PM-3503?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [PM-3553]: https://bitwarden.atlassian.net/browse/PM-3553?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [PM-7430]: https://bitwarden.atlassian.net/browse/PM-7430?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 2025-11-26 23:54:39 -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#5146