github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-05-07 00:09:31 -05:00
Code Issues 1.1k Packages Projects Releases 122 Wiki Activity

[PR #5693] [MERGED] [PM-24721] Refactor AccountKeys to top-level common model #31980

New Issue
Closed
opened 2026-04-18 15:26:04 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-18 15:26:04 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/5693
Author: @SaintPatrck
Created: 8/14/2025
Status: ✅ Merged
Merged: 8/14/2025
Merged by: @SaintPatrck

Base: main ← Head: PM-24721/update-get-tokens-response-model

📝 Commits (1)

  • d644eb4 [PM-24721] Refactor AccountKeys to top-level common model

📊 Changes

12 files changed (+185 additions, -139 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSource.kt (+3 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceImpl.kt (+3 -2)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceTest.kt (+4 -4)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/auth/datasource/disk/util/FakeAuthDiskSource.kt (+4 -3)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt (+2 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/util/GetTokenResponseExtensionsTest.kt (+2 -0)
➕ network/src/main/kotlin/com/bitwarden/network/model/AccountKeysJson.kt (+75 -0)
📝 network/src/main/kotlin/com/bitwarden/network/model/GetTokenResponseJson.kt (+12 -0)
📝 network/src/main/kotlin/com/bitwarden/network/model/SyncResponseJson.kt (+5 -73)
📝 network/src/test/kotlin/com/bitwarden/network/service/IdentityServiceTest.kt (+19 -0)
➕ network/src/testFixtures/kotlin/com/bitwarden/network/model/AccountKeysJsonUtil.kt (+55 -0)
📝 network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseProfileUtil.kt (+1 -55)

📄 Description

🎟️ Tracking

Completes PM-24721
Relates to https://github.com/bitwarden/server/pull/5982

📔 Objective

Refactored AccountKeys to be a top-level model AccountKeysJson in the network module.
This change allows AccountKeysJson to be used in GetTokenResponseJson and SyncResponseJson.Profile.

The corresponding test fixtures for creating mock AccountKeysJson instances were also moved to a new file AccountKeysJsonUtil.kt in the network testFixtures.

AuthDiskSource and its implementation AuthDiskSourceImpl, along with the test fake FakeAuthDiskSource, were updated to use the new AccountKeysJson model.

⏰ 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/5693 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 8/14/2025 **Status:** ✅ Merged **Merged:** 8/14/2025 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `PM-24721/update-get-tokens-response-model` --- ### 📝 Commits (1) - [`d644eb4`](https://github.com/bitwarden/android/commit/d644eb4a3f7fe9fe85d1e27138cfc432fc0c3caa) [PM-24721] Refactor AccountKeys to top-level common model ### 📊 Changes **12 files changed** (+185 additions, -139 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSource.kt` (+3 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceImpl.kt` (+3 -2) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceTest.kt` (+4 -4) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/auth/datasource/disk/util/FakeAuthDiskSource.kt` (+4 -3) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt` (+2 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/util/GetTokenResponseExtensionsTest.kt` (+2 -0) ➕ `network/src/main/kotlin/com/bitwarden/network/model/AccountKeysJson.kt` (+75 -0) 📝 `network/src/main/kotlin/com/bitwarden/network/model/GetTokenResponseJson.kt` (+12 -0) 📝 `network/src/main/kotlin/com/bitwarden/network/model/SyncResponseJson.kt` (+5 -73) 📝 `network/src/test/kotlin/com/bitwarden/network/service/IdentityServiceTest.kt` (+19 -0) ➕ `network/src/testFixtures/kotlin/com/bitwarden/network/model/AccountKeysJsonUtil.kt` (+55 -0) 📝 `network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseProfileUtil.kt` (+1 -55) </details> ### 📄 Description ## 🎟️ Tracking Completes PM-24721 Relates to https://github.com/bitwarden/server/pull/5982 ## 📔 Objective Refactored `AccountKeys` to be a top-level model `AccountKeysJson` in the network module. This change allows `AccountKeysJson` to be used in `GetTokenResponseJson` and `SyncResponseJson.Profile`. The corresponding test fixtures for creating mock `AccountKeysJson` instances were also moved to a new file `AccountKeysJsonUtil.kt` in the network testFixtures. `AuthDiskSource` and its implementation `AuthDiskSourceImpl`, along with the test fake `FakeAuthDiskSource`, were updated to use the new `AccountKeysJson` model. ## ⏰ 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-04-18 15:26:04 -05: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#31980
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?