[PR #4978] [MERGED] [PM-19845] Migrate BaseDiskSource to data module #5368

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

📋 Pull Request Information

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

Base: mainHead: data-module/base-disk-source


📝 Commits (1)

  • 475afe4 [PM-19845] Migrate BaseDiskSource to data module

📊 Changes

19 files changed (+59 additions, -175 deletions)

View changed files

📝 app/build.gradle.kts (+1 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/BaseEncryptedDiskSource.kt (+1 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/ConfigDiskSourceImpl.kt (+1 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceImpl.kt (+1 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/FeatureFlagOverrideDiskSourceImpl.kt (+1 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/PushDiskSourceImpl.kt (+1 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/SettingsDiskSourceImpl.kt (+1 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/GeneratorDiskSourceImpl.kt (+1 -1)
📝 authenticator/build.gradle.kts (+1 -0)
📝 authenticator/src/main/kotlin/com/bitwarden/authenticator/data/auth/datasource/disk/AuthDiskSourceImpl.kt (+1 -2)
authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/BaseDiskSource.kt (+0 -140)
📝 authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/BaseEncryptedDiskSource.kt (+1 -0)
📝 authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/ConfigDiskSourceImpl.kt (+2 -2)
📝 authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/FeatureFlagDiskSourceImpl.kt (+2 -2)
📝 authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/FeatureFlagOverrideDiskSourceImpl.kt (+1 -0)
📝 authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/SettingsDiskSourceImpl.kt (+15 -16)
📝 authenticator/src/test/java/com/bitwarden/authenticator/data/platform/datasource/disk/FeatureFlagOverrideDiskSourceTest.kt (+11 -9)
📝 data/build.gradle.kts (+3 -1)
📝 data/src/main/kotlin/com/bitwarden/data/datasource/disk/BaseDiskSource.kt (+14 -2)

📄 Description

🎟️ Tracking

PM-19845

📔 Objective

The BaseDiskSource class, which is responsible for simplifying interactions with SharedPreferences, has been moved to the data module.

  • Removed BaseDiskSource from authenticator module.
  • Created BaseDiskSource in data module.
  • Updated FeatureFlagOverrideDiskSourceImpl, PushDiskSourceImpl, SettingsDiskSourceImpl, EnvironmentDiskSourceImpl, BaseEncryptedDiskSource, GeneratorDiskSourceImpl, FeatureFlagDiskSourceImpl, ConfigDiskSourceImpl and AuthDiskSourceImpl to use the new location of BaseDiskSource in the data module.
  • Updated app and authenticator build.gradle.kts to include data module.
  • Added dependency for androidx.core.ktx to data module.

📸 Screenshots

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/4978 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 4/3/2025 **Status:** ✅ Merged **Merged:** 4/3/2025 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `data-module/base-disk-source` --- ### 📝 Commits (1) - [`475afe4`](https://github.com/bitwarden/android/commit/475afe45a17f8c5459e31db3a9bdf8d76cc96e80) [PM-19845] Migrate `BaseDiskSource` to `data` module ### 📊 Changes **19 files changed** (+59 additions, -175 deletions) <details> <summary>View changed files</summary> 📝 `app/build.gradle.kts` (+1 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/BaseEncryptedDiskSource.kt` (+1 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/ConfigDiskSourceImpl.kt` (+1 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceImpl.kt` (+1 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/FeatureFlagOverrideDiskSourceImpl.kt` (+1 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/PushDiskSourceImpl.kt` (+1 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/SettingsDiskSourceImpl.kt` (+1 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/GeneratorDiskSourceImpl.kt` (+1 -1) 📝 `authenticator/build.gradle.kts` (+1 -0) 📝 `authenticator/src/main/kotlin/com/bitwarden/authenticator/data/auth/datasource/disk/AuthDiskSourceImpl.kt` (+1 -2) ➖ `authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/BaseDiskSource.kt` (+0 -140) 📝 `authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/BaseEncryptedDiskSource.kt` (+1 -0) 📝 `authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/ConfigDiskSourceImpl.kt` (+2 -2) 📝 `authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/FeatureFlagDiskSourceImpl.kt` (+2 -2) 📝 `authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/FeatureFlagOverrideDiskSourceImpl.kt` (+1 -0) 📝 `authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/SettingsDiskSourceImpl.kt` (+15 -16) 📝 `authenticator/src/test/java/com/bitwarden/authenticator/data/platform/datasource/disk/FeatureFlagOverrideDiskSourceTest.kt` (+11 -9) 📝 `data/build.gradle.kts` (+3 -1) 📝 `data/src/main/kotlin/com/bitwarden/data/datasource/disk/BaseDiskSource.kt` (+14 -2) </details> ### 📄 Description ## 🎟️ Tracking PM-19845 ## 📔 Objective The `BaseDiskSource` class, which is responsible for simplifying interactions with `SharedPreferences`, has been moved to the `data` module. - Removed `BaseDiskSource` from `authenticator` module. - Created `BaseDiskSource` in `data` module. - Updated `FeatureFlagOverrideDiskSourceImpl`, `PushDiskSourceImpl`, `SettingsDiskSourceImpl`, `EnvironmentDiskSourceImpl`, `BaseEncryptedDiskSource`, `GeneratorDiskSourceImpl`, `FeatureFlagDiskSourceImpl`, `ConfigDiskSourceImpl` and `AuthDiskSourceImpl` to use the new location of `BaseDiskSource` in the `data` module. - Updated `app` and `authenticator` build.gradle.kts to include `data` module. - Added dependency for `androidx.core.ktx` to `data` module. ## 📸 Screenshots <!-- 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 - 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-26 23:58:50 -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#5368