Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PM-14433: Null domain data #4268

Merged
merged 2 commits into from
Nov 8, 2024
Merged

Conversation

SaintPatrck
Copy link
Contributor

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-14433
Cherry-picked from #4243 (25097cb) on branch release/hotfix-v2024.11.1.

📔 Objective

This PR allows for the domains data to be nullable in the sync response JSON and handles all the downstream affects that change has.

⏰ Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation 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

Copy link
Contributor

github-actions bot commented Nov 8, 2024

Logo
Checkmarx One – Scan Summary & Detailsa9404f7c-1f68-478a-bfd1-bb2ab77d2340

No New Or Fixed Issues Found

Copy link

codecov bot commented Nov 8, 2024

Codecov Report

Attention: Patch coverage is 0% with 4 lines in your changes missing coverage. Please review.

Project coverage is 88.97%. Comparing base (b76f720) to head (a0434ff).
Report is 5 commits behind head on main.

Files with missing lines Patch % Lines
.../data/vault/datasource/disk/VaultDiskSourceImpl.kt 0.00% 0 Missing and 2 partials ⚠️
...en/data/vault/repository/util/DomainsExtensions.kt 0.00% 0 Missing and 2 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4268      +/-   ##
==========================================
- Coverage   88.98%   88.97%   -0.02%     
==========================================
  Files         445      445              
  Lines       38852    38852              
  Branches     5458     5461       +3     
==========================================
- Hits        34574    34570       -4     
  Misses       2369     2369              
- Partials     1909     1913       +4     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@SaintPatrck SaintPatrck force-pushed the cherrypick/hotfix-25097cba-to-main branch from da9f3e4 to eb03add Compare November 8, 2024 18:08
Copy link
Collaborator

@dseverns-livefront dseverns-livefront left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SaintPatrck SaintPatrck force-pushed the cherrypick/hotfix-25097cba-to-main branch from eb03add to a2cbf7e Compare November 8, 2024 18:09
@@ -121,12 +121,12 @@ class VaultDiskSourceImpl(
},
)

override fun getDomains(userId: String): Flow<SyncResponseJson.Domains> =
override fun getDomains(userId: String): Flow<SyncResponseJson.Domains?> =
domainsDao
.getDomains(userId)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be rebased and then address this issue: https://github.com/bitwarden/android/pull/4263/files#r1834799472

Copy link
Collaborator

@david-livefront david-livefront left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs to be rebased and remove the filterNotNull() call

@SaintPatrck SaintPatrck force-pushed the cherrypick/hotfix-25097cba-to-main branch from 2d81960 to 283c353 Compare November 8, 2024 19:51
@SaintPatrck SaintPatrck force-pushed the cherrypick/hotfix-25097cba-to-main branch from efe33a7 to a0434ff Compare November 8, 2024 19:56
@SaintPatrck SaintPatrck enabled auto-merge November 8, 2024 20:05
@SaintPatrck SaintPatrck added this pull request to the merge queue Nov 8, 2024
Merged via the queue into main with commit fe84feb Nov 8, 2024
9 checks passed
@SaintPatrck SaintPatrck deleted the cherrypick/hotfix-25097cba-to-main branch November 8, 2024 20:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants