Cherry-pick 2025.4.0 fixes onto main main #1545
Merged
Conversation
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
luhmirin-s
requested review from
a team,
BurningAXE,
TristramN,
alex-vt,
alexandr-simprints,
Copilot,
meladRaouf and
ybourgery
and removed request for
a team
There was a problem hiding this comment.
Pull request overview
This PR cherry-picks bug fixes from the 2025.4.0 release branch onto the main branch, resolving conflicts from the modality refactoring. The changes primarily address MDIF (Multi-Factor ID) related issues, including credential match prioritization, event tracking for external credential matches, and navigation flow improvements.
Changes:
- Fixed credential match result prioritization to ensure external credential matches take precedence over direct biometric matches
- Added event tracking for one-to-one match events during external credential verification
- Improved back button handling in external credential flows
Reviewed changes
Copilot reviewed 13 out of 13 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/response/CreateIdentifyResponseUseCase.kt | Refactored logic to prioritize credential matches over direct matches when returning identification results |
| feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/response/CreateIdentifyResponseUseCaseTest.kt | Added test for credential prioritization and updated existing test setup |
| feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/cache/OrchestratorCacheIntegrationTest.kt | Updated mock object to include new CredentialMatch fields |
| feature/external-credential/src/main/java/com/simprints/feature/externalcredential/usecase/ExternalCredentialEventTrackerUseCase.kt | Added saveMatchEvent method to track one-to-one match events with fingerprint comparison strategy |
| feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/search/usecase/MatchCandidatesUseCase.kt | Integrated match event tracking into candidate matching flow |
| feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/search/ExternalCredentialSearchViewModel.kt | Fixed timing of search event tracking and cleaned up code formatting |
| feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectFragment.kt | Added back button handler to trigger skip scanning action |
| feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialControllerFragment.kt | Updated back button navigation logic for different credential screens |
| feature/external-credential/src/main/java/com/simprints/feature/externalcredential/model/CredentialMatch.kt | Added probeReferenceId and matcherName fields to support event tracking |
| feature/external-credential/src/test/java/com/simprints/feature/externalcredential/usecase/ExternalCredentialEventTrackerUseCaseTest.kt | Added tests for match event saving with face and fingerprint SDKs |
| feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/search/usecase/MatchCandidatesUseCaseTest.kt | Updated test setup and assertions to verify event tracking integration |
| feature/external-credential/src/main/java/com/simprints/feature/externalcredential/model/ExternalCredentialParams.kt | Reordered imports (alphabetical) |
| feature/external-credential/src/main/java/com/simprints/feature/externalcredential/ExternalCredentialContract.kt | Reordered imports (alphabetical) |
...om/simprints/feature/externalcredential/usecase/ExternalCredentialEventTrackerUseCaseTest.kt
Show resolved
Hide resolved
luhmirin-s
force-pushed
the
merge/2025.4.0-main
branch
10 times, most recently
from
f10d2a0 to
1db2a50
Compare
alexandr-simprints
approved these changes
Jan 20, 2026
luhmirin-s
force-pushed
the
merge/2025.4.0-main
branch
from
1db2a50 to
16838a3
Compare
BurningAXE
approved these changes
Jan 20, 2026
…he 'skip credential scan' screen. Except for any credential scan screen (#1497)
luhmirin-s
force-pushed
the
merge/2025.4.0-main
branch
from
16838a3 to
01396b7
Compare
…al matches first, ignoring the confidence threshold (#1496) * [MS-1271] Identification results now always return the MF-ID credential matches first, ignoring the confidence threshold. This way the callout app ˆcan display the credential holder GUIDs alongside their match score * [MS-1271] Adding a test case covering scenario where both credential matches and 1:N matches are returned in the identification response. All credentials are also now properly sorted by confidence score DESC * [MS-1271] Fixing tests # Conflicts: # feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/usecases/response/CreateIdentifyResponseUseCase.kt # feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/usecases/response/CreateIdentifyResponseUseCaseTest.kt
* [MS-1290] Each credential match now produces a OneToOne event * [MS-1290] Moving the OneToOne match events from ViewModel to the MatchCandidatesUseCase to properly reflect the start and end time # Conflicts: # feature/external-credential/src/main/java/com/simprints/feature/externalcredential/model/CredentialMatch.kt # feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/search/ExternalCredentialSearchViewModel.kt # feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/search/usecase/MatchCandidatesUseCase.kt # feature/external-credential/src/main/java/com/simprints/feature/externalcredential/usecase/ExternalCredentialEventTrackerUseCase.kt # feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/search/usecase/MatchCandidatesUseCaseTest.kt # feature/external-credential/src/test/java/com/simprints/feature/externalcredential/usecase/ExternalCredentialEventTrackerUseCaseTest.kt # feature/orchestrator/src/test/java/com/simprints/feature/orchestrator/cache/OrchestratorCacheIntegrationTest.kt
luhmirin-s
force-pushed
the
merge/2025.4.0-main
branch
from
01396b7 to
2cb5b49
Compare
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Will be released in: 2026.1.0
Notable changes
Testing guidance
Additional work checklist