github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-03-09 11:44:41 -05:00
Code Issues 144 Packages Projects Releases 116 Wiki Activity

[PR #5063] [MERGED] [PM-20309] Migrate Environment and EnvironmentUrlDataJson to data module #5446

New Issue
Closed
opened 2025-11-27 00:00:00 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-27 00:00:00 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/5063
Author: @SaintPatrck
Created: 4/15/2025
Status: ✅ Merged
Merged: 4/16/2025
Merged by: @SaintPatrck

Base: main ← Head: data-module/environment

📝 Commits (1)

  • c039321 [PM-20309] Migrate Environment and EnvironmentUrlDataJson to data module

📊 Changes

100 files changed (+155 additions, -677 deletions)

View changed files

📝 app/src/fdroid/java/com/x8bit/bitwarden/data/platform/manager/LogsManagerImpl.kt (+1 -1)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/model/AccountJson.kt (+1 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt (+1 -1)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/UserState.kt (+1 -2)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/GetTokenResponseExtensions.kt (+1 -1)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensions.kt (+1 -1)
📝 app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSource.kt (+1 -1)
📝 app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceImpl.kt (+1 -1)
📝 app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/interceptor/BaseUrlInterceptors.kt (+5 -5)
📝 app/src/main/java/com/x8bit/bitwarden/data/platform/manager/LogsManager.kt (+1 -1)
📝 app/src/main/java/com/x8bit/bitwarden/data/platform/manager/restriction/RestrictionManagerImpl.kt (+1 -1)
📝 app/src/main/java/com/x8bit/bitwarden/data/platform/repository/EnvironmentRepository.kt (+1 -1)
📝 app/src/main/java/com/x8bit/bitwarden/data/platform/repository/EnvironmentRepositoryImpl.kt (+3 -3)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnViewModel.kt (+1 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentViewModel.kt (+2 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt (+1 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingViewModel.kt (+1 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreen.kt (+1 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationViewModel.kt (+4 -4)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/handlers/StartRegistrationHandler.kt (+1 -1)

...and 80 more files

📄 Description

🎟️ Tracking

PM-20309

📔 Objective

Moved Environment and EnvironmentUrlDataJson from the app and authenticator modules to the data module. Removed duplicate implementations from the app and authenticator modules. Updated all usages of those classes to use the new implementation in data. Added EnvironmentUrlDataJsonExtensions to data that contains utility functions for EnvironmentUrlDataJson.

⏰ 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/5063 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 4/15/2025 **Status:** ✅ Merged **Merged:** 4/16/2025 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `data-module/environment` --- ### 📝 Commits (1) - [`c039321`](https://github.com/bitwarden/android/commit/c0393215be9a3d8f30d0df6482568aebc0b257f9) [PM-20309] Migrate Environment and EnvironmentUrlDataJson to data module ### 📊 Changes **100 files changed** (+155 additions, -677 deletions) <details> <summary>View changed files</summary> 📝 `app/src/fdroid/java/com/x8bit/bitwarden/data/platform/manager/LogsManagerImpl.kt` (+1 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/model/AccountJson.kt` (+1 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt` (+1 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/UserState.kt` (+1 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/GetTokenResponseExtensions.kt` (+1 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensions.kt` (+1 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSource.kt` (+1 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceImpl.kt` (+1 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/interceptor/BaseUrlInterceptors.kt` (+5 -5) 📝 `app/src/main/java/com/x8bit/bitwarden/data/platform/manager/LogsManager.kt` (+1 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/data/platform/manager/restriction/RestrictionManagerImpl.kt` (+1 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/data/platform/repository/EnvironmentRepository.kt` (+1 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/data/platform/repository/EnvironmentRepositoryImpl.kt` (+3 -3) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnViewModel.kt` (+1 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentViewModel.kt` (+2 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt` (+1 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingViewModel.kt` (+1 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreen.kt` (+1 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationViewModel.kt` (+4 -4) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/handlers/StartRegistrationHandler.kt` (+1 -1) _...and 80 more files_ </details> ### 📄 Description ## 🎟️ Tracking PM-20309 ## 📔 Objective Moved `Environment` and `EnvironmentUrlDataJson` from the `app` and `authenticator` modules to the `data` module. Removed duplicate implementations from the `app` and `authenticator` modules. Updated all usages of those classes to use the new implementation in `data`. Added `EnvironmentUrlDataJsonExtensions` to data that contains utility functions for `EnvironmentUrlDataJson`. ## ⏰ 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:00:00 -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#5446
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?