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

[PR #5885] [MERGED] [PM-25826] Update folderRelationships type for cipher import #18876

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

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/5885
Author: @SaintPatrck
Created: 9/15/2025
Status: ✅ Merged
Merged: 9/17/2025
Merged by: @SaintPatrck

Base: main ← Head: cxf/network/fix-import-ciphers-requets-json

📝 Commits (2)

  • 6d4dce7 [PM-25826] Update folderRelationships type for cipher import
  • c0aa85b Refactor ImportCiphersJsonRequest folderRelationships type

📊 Changes

3 files changed (+20 additions, -7 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/CredentialExchangeImportManagerImpl.kt (+1 -1)
📝 network/src/main/kotlin/com/bitwarden/network/model/ImportCiphersJsonRequest.kt (+17 -4)
📝 network/src/test/kotlin/com/bitwarden/network/service/CiphersServiceTest.kt (+2 -2)

📄 Description

🎟️ Tracking

PM-25826

📔 Objective

The folderRelationships property in ImportCiphersJsonRequest was changed from Map<Int, Int> to List<Int32Int32KeyValuePairJson>.

A new data class Int32Int32KeyValuePairJson was introduced to represent the key-value pairs for folder relationships, enhancing type safety and clarity.

⏰ 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/5885 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 9/15/2025 **Status:** ✅ Merged **Merged:** 9/17/2025 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `cxf/network/fix-import-ciphers-requets-json` --- ### 📝 Commits (2) - [`6d4dce7`](https://github.com/bitwarden/android/commit/6d4dce7d074a30b82c5b5db520b45de6e5f66a66) [PM-25826] Update `folderRelationships` type for cipher import - [`c0aa85b`](https://github.com/bitwarden/android/commit/c0aa85bec36054d0064864c2904c474792a3e7ef) Refactor ImportCiphersJsonRequest folderRelationships type ### 📊 Changes **3 files changed** (+20 additions, -7 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/CredentialExchangeImportManagerImpl.kt` (+1 -1) 📝 `network/src/main/kotlin/com/bitwarden/network/model/ImportCiphersJsonRequest.kt` (+17 -4) 📝 `network/src/test/kotlin/com/bitwarden/network/service/CiphersServiceTest.kt` (+2 -2) </details> ### 📄 Description ## 🎟️ Tracking PM-25826 ## 📔 Objective The `folderRelationships` property in `ImportCiphersJsonRequest` was changed from `Map<Int, Int>` to `List<Int32Int32KeyValuePairJson>`. A new data class `Int32Int32KeyValuePairJson` was introduced to represent the key-value pairs for folder relationships, enhancing type safety and clarity. ## ⏰ 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-15 03:32:48 -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#18876
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?