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

[PR #6397] [MERGED] [PM-31069] Add OrganizationId support for Vault Migration operations #54765

New Issue
Closed
opened 2026-05-01 20:29:05 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-05-01 20:29:05 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/6397
Author: @aj-rosado
Created: 1/22/2026
Status: ✅ Merged
Merged: 1/23/2026
Merged by: @aj-rosado

Base: main ← Head: PM-31069/no-logs-showing-on-item-migration-operations

📝 Commits (2)

  • bcb2a9f Add OrganizationId support for ItemOrganizationDeclined and ItemOrganizationAccepted
  • 8438995 set organizationId as abstract and put the default on the individual events on the OrganizationEvent

📊 Changes

14 files changed (+129 additions, -9 deletions)

View changed files

➕ app/schemas/com.x8bit.bitwarden.data.platform.datasource.disk.database.PlatformDatabase/2.json (+70 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSourceImpl.kt (+2 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/platform/datasource/disk/database/PlatformDatabase.kt (+5 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/platform/datasource/disk/entity/OrganizationEventEntity.kt (+3 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerImpl.kt (+1 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/model/OrganizationEvent.kt (+23 -4)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/leaveorganization/LeaveOrganizationViewModel.kt (+3 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/migratetomyitems/MigrateToMyItemsViewModel.kt (+3 -1)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSourceTest.kt (+8 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerTest.kt (+3 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/leaveorganization/LeaveOrganizationViewModelTest.kt (+3 -1)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/migratetomyitems/MigrateToMyItemsViewModelTest.kt (+3 -1)
📝 network/src/main/kotlin/com/bitwarden/network/model/OrganizationEventJson.kt (+1 -0)
📝 network/src/test/kotlin/com/bitwarden/network/service/EventServiceTest.kt (+1 -0)

📄 Description

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-31069

📔 Objective

ItemOrganization events need the organizationId. It was added to those events and also to the Database.

  • Network layer - organizationId field added to JSON serialization
  • Database layer - v2 schema generated with organization_id column
  • Domain layer - Event models updated to support organization ID
  • Data/Manager layers - All mapping logic updated
  • Presentation layer - ViewModels passing the correct organization ID
  • Tests - All unit tests updated and passing

⏰ 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/6397 **Author:** [@aj-rosado](https://github.com/aj-rosado) **Created:** 1/22/2026 **Status:** ✅ Merged **Merged:** 1/23/2026 **Merged by:** [@aj-rosado](https://github.com/aj-rosado) **Base:** `main` ← **Head:** `PM-31069/no-logs-showing-on-item-migration-operations` --- ### 📝 Commits (2) - [`bcb2a9f`](https://github.com/bitwarden/android/commit/bcb2a9fa40d2eb2ce36a958d597e54484395157c) Add OrganizationId support for ItemOrganizationDeclined and ItemOrganizationAccepted - [`8438995`](https://github.com/bitwarden/android/commit/8438995a780ce2c7ed7b35dce67c71594b67a0fb) set organizationId as abstract and put the default on the individual events on the OrganizationEvent ### 📊 Changes **14 files changed** (+129 additions, -9 deletions) <details> <summary>View changed files</summary> ➕ `app/schemas/com.x8bit.bitwarden.data.platform.datasource.disk.database.PlatformDatabase/2.json` (+70 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSourceImpl.kt` (+2 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/platform/datasource/disk/database/PlatformDatabase.kt` (+5 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/platform/datasource/disk/entity/OrganizationEventEntity.kt` (+3 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerImpl.kt` (+1 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/model/OrganizationEvent.kt` (+23 -4) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/leaveorganization/LeaveOrganizationViewModel.kt` (+3 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/migratetomyitems/MigrateToMyItemsViewModel.kt` (+3 -1) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/platform/datasource/disk/EventDiskSourceTest.kt` (+8 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerTest.kt` (+3 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/leaveorganization/LeaveOrganizationViewModelTest.kt` (+3 -1) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/migratetomyitems/MigrateToMyItemsViewModelTest.kt` (+3 -1) 📝 `network/src/main/kotlin/com/bitwarden/network/model/OrganizationEventJson.kt` (+1 -0) 📝 `network/src/test/kotlin/com/bitwarden/network/service/EventServiceTest.kt` (+1 -0) </details> ### 📄 Description ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-31069 ## 📔 Objective ItemOrganization events need the organizationId. It was added to those events and also to the Database. - Network layer - organizationId field added to JSON serialization - Database layer - v2 schema generated with organization_id column - Domain layer - Event models updated to support organization ID - Data/Manager layers - All mapping logic updated - Presentation layer - ViewModels passing the correct organization ID - Tests - All unit tests updated and passing ## ⏰ 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-05-01 20:29:06 -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#54765
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?