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

Conversation

@d4rken
Copy link
Member

@d4rken d4rken commented Mar 18, 2021

Nothing major.

# Conflicts:
#	Corona-Warn-App/src/main/res/values/strings.xml
#	gradle.properties

ralfgehrer and others added 25 commits March 12, 2021 10:32
Change-Id: Ia5320da229d4d53fdb7bb89f2cb89fb445e5a92a
Co-authored-by: Ralf Gehrer <[email protected]>
Co-authored-by: Juraj Kusnier <[email protected]>
Co-authored-by: Ralf Gehrer <[email protected]>
Co-authored-by: harambasicluka <[email protected]>
This commit updates the repositories table.

Co-authored-by: Christian Neu <[email protected]>
Co-authored-by: harambasicluka <[email protected]>
* Revert string changes

* Revert TracingExplanationDialog

* Implement TracingExplanationDialog

* Update strings

* Update tests

* Remove unnecessary comment
* Update contact_diary_strings.xml

* Update strings.xml
* move logic to collector

* reset before new registration

* more tests

* fix test

* fix calculation for missing values and more tests

* fix test

* remove max

* use -1 as default if value cannot be calculated

* set default to -1

* change date in tests

* fix reset

Co-authored-by: Lukas Lechner <[email protected]>
* [INTERNAL] Translation delivery: commit by LX Lab

Change-Id: Icad98989d5e708235ad3cc3e46bb891b6fa9d49b

* [INTERNAL] Translation delivery: commit by LX Lab

Change-Id: I3e8c10ce666e2deb4e51392c0b602565f46e117b
* Create new entires in TestDonorSettings

* Lint

* Improve logging

* Add some tests

* More tests and more logs

* Docs

* Use aggregated date

* Log right date

* Use `RiskLevelResult.lastRiskEncounterAt`

* Add unit tests.

* Tweak logging.

Co-authored-by: harambasicluka <[email protected]>
Co-authored-by: Matthias Urhahn <[email protected]>
Co-authored-by: Ralf Gehrer <[email protected]>
…chlagen" (EXPOSUREAPP-5843) (#2632)

* Risk Level calculation is now only aborted when the user has seen the positive test result

* Fixed tests for Risk Level calc changes

Co-authored-by: harambasicluka <[email protected]>
Co-authored-by: Ralf Gehrer <[email protected]>
…REAPP-4484) #2638

* If there is an `initialTestResultReceivedTimestamp`  it may be the bug.
If there is also a registration value, but no `devicePairingSuccessfulAt` timestamp, then we are being called from `asyncRegisterDeviceViaGUID` or `asyncRegisterDeviceViaTAN`, and it's a new test and `initialTestResultReceivedTimestamp` should be null.

* Fix check order and add tests.
# Conflicts:
#	Corona-Warn-App/src/main/res/values/strings.xml
#	gradle.properties
@d4rken d4rken added the maintainers Tag pull requests created by maintainers label Mar 18, 2021
@d4rken d4rken added this to the 2.0.0 milestone Mar 18, 2021
@d4rken d4rken requested review from a team March 18, 2021 15:10
@d4rken d4rken added the author merge PR to be merged by author label Mar 18, 2021
@d4rken d4rken self-assigned this Mar 18, 2021
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 1 Code Smell

40.7% 40.7% Coverage
0.0% 0.0% Duplication

@d4rken d4rken merged commit 3a449ca into release/2.0.x Mar 18, 2021
@d4rken d4rken deleted the chore/DEV-merge-1.5.x-into-2.0.x branch March 18, 2021 15:23
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

author merge PR to be merged by author maintainers Tag pull requests created by maintainers

Projects

None yet

Development

Successfully merging this pull request may close these issues.