Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

Add comment to prevent accidentally breaking the fix for EXPOSUREAPP-4484 (DEV) #2648

Merged
merged 3 commits into from
Mar 22, 2021
Merged

Add comment to prevent accidentally breaking the fix for EXPOSUREAPP-4484 (DEV) #2648

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c87068a
Add comment to prevent accidentally breaking the fix for EXPOSUREAPP-…
d4rken Mar 19, 2021
21769ed
Merge branch 'release/2.0.x' into fix/DEV-add-comment-for-EA4484
harambasicluka Mar 19, 2021
7130d44
Merge branch 'release/2.0.x' into fix/DEV-add-comment-for-EA4484
chris-cwa Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/SubmissionRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,13 @@ class SubmissionRepository @Inject constructor(
suspend fun asyncRegisterDeviceViaTAN(tan: String) {
analyticsKeySubmissionCollector.reset()
val registrationData = submissionService.asyncRegisterDeviceViaTAN(tan)
// START - Fix for EXPOSUREAPP-4484 relies on this call order
submissionSettings.registrationToken.update {
registrationData.registrationToken
}
updateTestResult(registrationData.testResult)
submissionSettings.devicePairingSuccessfulAt = timeStamper.nowUTC
// END
Comment on lines +129 to +135
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
// START - Fix for EXPOSUREAPP-4484 relies on this call order
submissionSettings.registrationToken.update {
registrationData.registrationToken
}
updateTestResult(registrationData.testResult)
submissionSettings.devicePairingSuccessfulAt = timeStamper.nowUTC
// END
// region Fix for EXPOSUREAPP-4484 relies on this call order
submissionSettings.registrationToken.update {
registrationData.registrationToken
}
updateTestResult(registrationData.testResult)
submissionSettings.devicePairingSuccessfulAt = timeStamper.nowUTC
// endregion

backgroundNoise.scheduleDummyPattern()
analyticsKeySubmissionCollector.reportTestRegistered()
analyticsKeySubmissionCollector.reportRegisteredWithTeleTAN()
Expand All @@ -139,11 +141,13 @@ class SubmissionRepository @Inject constructor(
suspend fun asyncRegisterDeviceViaGUID(guid: String): TestResult {
analyticsKeySubmissionCollector.reset()
val registrationData = submissionService.asyncRegisterDeviceViaGUID(guid)
// START - Fix for EXPOSUREAPP-4484 relies on this call order
submissionSettings.registrationToken.update {
registrationData.registrationToken
}
updateTestResult(registrationData.testResult)
submissionSettings.devicePairingSuccessfulAt = timeStamper.nowUTC
// END
Comment on lines +144 to +150
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
// START - Fix for EXPOSUREAPP-4484 relies on this call order
submissionSettings.registrationToken.update {
registrationData.registrationToken
}
updateTestResult(registrationData.testResult)
submissionSettings.devicePairingSuccessfulAt = timeStamper.nowUTC
// END
// region Fix for EXPOSUREAPP-4484 relies on this call order
submissionSettings.registrationToken.update {
registrationData.registrationToken
}
updateTestResult(registrationData.testResult)
submissionSettings.devicePairingSuccessfulAt = timeStamper.nowUTC
// endregion

backgroundNoise.scheduleDummyPattern()
analyticsKeySubmissionCollector.reportTestRegistered()
return registrationData.testResult
Expand Down