2025.2.0 Backport#1280
Merged
Merged
Conversation
…field-to-the-confirmation-callout-2 [MS-1065] Adding 'metadata' field to the ConfirmationCalloutEventV3
Disable file log writer on per-oreo Android versions
Hide DB info from troubleshooting screen when user isn't logged in
Do not keep sessions if project is paused or ended
…025.2.0 # Conflicts: # infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/callout/ApiConfirmationCallout.kt # infra/events/src/main/java/com/simprints/infra/events/event/domain/models/callout/ConfirmationCalloutEvent.kt
…-fix MS-1077 Only return templates of the correct format for matching
…ype. Adding `@JsonTypeInfo(use = JsonTypeInfo.Id.NONE)` annotation to the metadata field to prevent Jackson from treating the `metadata` field as polymorphic.
…erageReports annotation to exclude from Sonar test coverage
…tCoverageReports annotation to exclude from Sonar test coverage
…he-enrolment-record-events-when-there-is-the-metadata-field [MS-1076] Fix: SID is not handling the enrolment record events when there is the metadata field
100% translated source file: 'strings.xml' on 'bn'.
100% translated source file: 'strings.xml' on 'hi'.
100% translated source file: 'strings.xml' on 'am_ET'.
100% translated source file: 'strings.xml' on 'am'.
100% translated source file: 'strings.xml' on 'fr'.
Hotfix/translations backport
meladRaouf
approved these changes
Jul 23, 2025
luhmirin-s
force-pushed
the
merge/2025.2.0
branch
from
e321ec2 to
03e036a
Compare
luhmirin-s
requested review from
a team and
BurningAXE
and removed request for
a team
luhmirin-s
requested review from
TristramN,
alex-vt,
alexandr-simprints and
ybourgery
alexandr-simprints
approved these changes
Jul 23, 2025
# Conflicts: # feature/login-check/src/main/java/com/simprints/feature/logincheck/usecases/ReportActionRequestEventsUseCase.kt # infra/events/src/debug/java/com/simprints/infra/events/sampledata/EventFactoryUtils.kt # infra/events/src/test/java/com/simprints/infra/events/event/domain/models/EventPayloadTest.kt # infra/events/src/test/java/com/simprints/infra/events/event/domain/models/callout/ConfirmationCalloutEventV2Test.kt
luhmirin-s
force-pushed
the
merge/2025.2.0
branch
from
03e036a to
8242d56
Compare
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Bringing hotfix back to main.
@BurningAXE, @alexandr-simprints, please take a closer look at the events files. There were merge conflicts between the confirmation callout event refactoring and metadata addition.