# Conflicts:
#	gradle.properties

Co-authored-by: Mohamed Metwalli <mohamed.metwalli@sap.com>

* Bump to next Version 1.11.0.8 (DEV) #2220

* Added Hyperlink to Issue 332 in Readme

Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>
Co-authored-by: CWA Technical User <67319337+Corona-Warn-App-Technical-User@users.noreply.github.com>
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>

# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/pcr/PCRProcessor.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/rapidantigen/RapidAntigenProcessor.kt
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/type/rapidantigen/RapidAntigenProcessorTest.kt
#	gradle.properties

* add storage

* adjust donor

* refactor detector

* tests

* fix tests

* fix tests

* klint

* fixes

* fix crash

* fix shared prefs

* fix shared prefs

* detekt

* refactoring

* fix tests

* fix type
klint

* remove unnecessary storage

* use last calculated

* remove change detector

* use last calculated

* fix test

* merge 2.4

* fix naming

* fix getLastChangeToHighRiskPt/Ew

* calculations unit tests

* refactoring

* refactoring

* Catch IndexOutOfBoundsExceptions in the DebugLogger and log out information

* Fix IndexOutOfBoundsException due to censored string bounds exceeding original log message.

* Fix missing censoring if log lines contain the same value multiple times.

* Remove unused code.

* Adjust CensoredString.censor(...) to determine the bounds always on the original.

* Add test for incorrectly censored message due to changed bounds (working with bounds on the censored message, instead of original message).

* Implement internal censoring collision handling within each censoring module.

* Remove superfluous factory method.

* Move the final censor compilation step to the DebugLogger, in case of collisions we don't need to do all the work.
Re-use censor container for "per module" censoring and the "top-level" combination of all modules.

* Adjust censoring for values that need to be censored, but do not overlap, each other, just touch: "<ABC><DEF>".

* LINTs

* Don't pass all meta data to censoring, we only need to censor the line, the metadata can be added later. No unnecessary string work.

* Fix typos and docs.

* Remove coerce as we work only the original.

* Implement equals/hashcode for replacement actions and changed collection from LIST to SET, to prevent collisions due to duplicate replacement actions.

* If a censor throws an exception, censor everything as precaution.

* Fix flaky test.

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Co-authored-by: BMItter <Berndus@gmx.de>
Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>

Rapid Antigen Tests: Retrieve Test Result Timestamp from Verification Server (EXPOSUREAPP-6865) (#3287)

* Added polling of sampleCollectedAt to Rat test exchange

* Fixed linting unit tests and formatting

* Switched from result, instant pair to CoronaTestResultResponse data class for clarity

* using .copy where appropriate

* Fixed unittests

* Looks weird to me but ktlint wants it

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Co-authored-by: Mohamed Metwalli <mohamed.metwalli@sap.com>

* Change Max Mustermann to Andrea Schneider in VaccinationList Screenshots

* Fix Screenshot images in SubmissionDispatcherFragment

* Add new screenshot for the Home Screen with 2 negative tests PCR and RAT

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>

* Add tests for valueset storage format.

* Remove extra case and add check for reloading.

Change-Id: I7bcf8306d7ee17b065530afd3d30345a918305f9

* Refactoring

* Move rest to events

* Handle Nullable

Co-authored-by: chris-cwa <69595386+chris-cwa@users.noreply.github.com>

* Setup green certificate UI

* Revert

Co-authored-by: BMItter <Berndus@gmx.de>
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>

Co-authored-by: Mohamed Metwalli <mohamed.metwalli@sap.com>

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>

* Added Pt metadata to ExposureRiskMetadataDonor

* Added Pt metadata to AnalyticsKeySubmissionDonor

* Added Pt metadata to TestResultDonor

* Fixed ppa unit tests

* linting

* Revert "Added Pt metadata to TestResultDonor"

This reverts commit 1edced45a2d7fa2f2db866472d2ea4cd40dbde65.

* Revert "Added Pt metadata to AnalyticsKeySubmissionDonor"

This reverts commit c45c977c3001fe32dc20d9cbf77b58f665ad5fe0.

* Reverted unit tests that are not for ExposureRiskMetadataDonor

* Some more minor changes to ExposureRiskMetadataDonor to adress comments

* Removed more unused code

* linting

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Co-authored-by: Chilja Gossow <49635654+chiljamgossow@users.noreply.github.com>

* default strings

* ignore missing translations

Co-authored-by: I502720 <axel.herbstreith@sap.com>

# Conflicts:
#	gradle.properties

* Parameterise correction level

* Fix test

* Fix instrumentation test

* Update QrCodeGenerator.kt

* Current config

* Lint

* Fix tests

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Co-authored-by: I502720 <axel.herbstreith@sap.com>

* Use last successful diagnosis key download as time reference for the deadman notification.

* Use last successful diagnosis key download as time reference for the deadman notification.

* Reuse mocking function.

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Co-authored-by: Alex Paulescu <alex.paulescu@gmail.com>

* OSD back button does same thing as cancel button.

* Make solution isolated

* Fix linting

* Simplified condition.

* Cancel function now works consistently with all invalid QR codes.

* Renamed function.

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Co-authored-by: Alexander Alferov <a.alferov@sap.com>
Co-authored-by: Juraj Kusnier <jurajkusnier@users.noreply.github.com>
Co-authored-by: Mohamed Metwalli <mohamed.metwalli@sap.com>

* Added fun to delete corona tests, Added corona tests to retention

* Added tests

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>

Change-Id: I5d9a9846d9ff3231208570ad6d30ab2b379c60a1

 Contact Journal Extension - Show RAT and PCR Tests results in Contact Journal (EXPOSUREAPP-6040) (#3258)

* prepare new TestResultRepository

* Code refactoring

* Update tests

* Remove old files

* Code refactoring

* Move TestJournal Table to ContactDiaryDatabase

* remove unused files

* revert DataReset.kt

* rename ContactDiaryTest > ContactDiaryCoronaTest

* rename ContactDiaryTestEntity > ContactDiaryCoronaTestEntity

* add some tests

* New UI row to contact journal day overview for corona tests

* Support multiple tests in the same day

* ListAdapter > BaseAdapter

* update tests

* update file formatting

* update ContactDiaryCoronaTestEntity

* add comment

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>

* Change to HotDataFlow

* Created test data for value sets, Adjusted storage tests, Also save null values

* Adjusted repo test

* Only emit when content changed

* ktlint & sourcecheck

* Thread safety

* Return empty value set as default

* detekt and sourceclean

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>

Co-authored-by: Mohamed Metwalli <mohamed.metwalli@sap.com>

Was off by 1 day to `toDateTimeAtStartOfDay` not being used on nowUTC.
Reuse `getTimeUntilImmunity` in `getVaccinationStatus`

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>

Co-authored-by: Mohamed Metwalli <mohamed.metwalli@sap.com>
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Co-authored-by: Mohamed Metwalli <mohamed.metwalli@sap.com>

* On low storage, the system may clean caches without asking, if the parent dir of the debuglog is deleted, writing will fail with an exception.
Catch that exception, and try to recreate the path+file, otherwise fail silently.

* Update logsize after retry as log could have been deleted.

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Co-authored-by: AlexanderAlferov <64849422+AlexanderAlferov@users.noreply.github.com>

Contact Diary data is written in clear text into error log on data deletion (EXPOSUREAPP-7408) (#3261)

* Censor people even after they got deleted in the contact diary

* Censor people encounters even after they got deleted in the contact diary

* Fix thread-safety

* Censor contact diary locations even when they got deleted previously

* Censor contact diary visits even when they got deleted previously

* Fix lint

* Censor checkIns even if they already got deleted

* Censor TraceLocations even if they already got deleted

* Censor RACoronaTests even if they already got deleted

* Adjust RatProfileCensorTest.kt

* Improve Thread-Safety of some censors

* Refactor CoronaTestCensor.kt

* Fix lint

* Fix DiaryEncounterCensor.kt

* Fix CheckInsCensorTest

* Fix CensorInjectionTest.kt

* Add mutex lock

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>