# Conflicts:
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/TestRiskLevelCalculationFragment.kt
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt
#	Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml
#	Corona-Warn-App/src/deviceForTesters/res/navigation/nav_graph.xml
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/di/ApplicationComponent.kt
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransactionTest.kt

* update privacy de & en

* added html lists

* updated user consent

* fixed comment

* update tr privacy text

* update privacy de & en

* added html lists

* updated user consent

* fixed comment

* Improve error message and add logic for future display of formatted error messages.

* Address PR review comments.

* QuotaCalculator V2

* Add extra logging for transaction and worker exceptions. (#1195) (EXPOSUREAPP-2640)

* Remove QuotaCalculation due to unexpected sideeffects. (#1196) (EXPOUSREAPP-2640)

* Fix klint/sourceCheck.

* Add test for first initialization.

* Add visibility modifier

* Simplify quota reset time calculation and extend tests for edge cases.

* Reduce impact of quota check to a warning for 1.4.
Add tests for silent quota check and configuration fallback behavior.

* Addressed PR comments.

We need to hook into `viewLifecycleOwner` not `lifeCycleOwner` otherwise the DataBinding is not correctly recreated whe fragments are reattached. (#1182)

Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>

Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>

Refactor MD5 extraction to be part of `DiagnosisKeyServer`'s responsibility.

Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>

Fix interop squash commit

This reverts commit 6054bf57.

* Added first set of country flags

Signed-off-by: Kolya Opahle <k.opahle@sap.com>

* Added first implementation of Submission Country Selection Screen. (Currently not part of nav graph).
Moved stuff inside of submission package into subpackages

Signed-off-by: Kolya Opahle <k.opahle@sap.com>

* Added missing changes to nav_graph file

* Test Menu options for Country selection and Measurement (EXPOSUREAPP-2229) (#1086)

* Implement country filter (#2229)

* Implement measure for Risk calculation and Key Retrieval (#2229)

* Some code cleanup for measureRiskLevelAndKeyRetrieval

* Some code cleanup (#2229)

* Implement usage of AppConfig usage for country codes (#2229)

* change CURRENT_COUNTRY val to var

* Suppress "LongMethod" warning (#2229)

* Adjust unit tests to respect new country filter

* Align with backend for app config country property name

* Display total file size of keys in results (#2229)

* Fix linting issue

* Update strings.xml files

* Do refactoring and some code clean up

* Move RiskLevel and Key retrieval measurement in own class

* Move code in logical classes. Remove translation in test fragment

* Fix linting and Unit tests

* Remove 3hour boolean check from debug class.

* Refactor CountryWrapper and missing dates check.

* Fix linting and Unit tests

* Add Unit test for getMissingDates

* Code cleanup

* Hide keyboard on action

* Extend statistics for api submission

* Set callback to null after invoked

Co-authored-by: Mert Safter <mert.safter@sap.com>
Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>

* Overhaul of DiagnosisKey related Download and Caching Mechanisms (EXPOSUREAPP-2469) (#1136)

* Rework of keyfile download and caching.
* Supports interop
* More modular for better testing and build flavour based behavior adjustments
* More resilient handling of failed downloads
* Preperations for future hourly download and serverside checksums

TODO: Finish unit tests, keycache migration and cache health check

* First batch of unit tests and some fixes for incorrect behavior that the tests surfaced.

* Added unit tests for the KeyCacheRepository

TODO: Tests for downloader and migration.

* Implemented POC for migration old key files.

* Fixed legacy file migration and cleanup, improved logging.

* Added unit tests for legacy key file migration.

* Add fallback for different file hashes in the header.

* Yes kLint, we know it's a long method,
but for this it's better to read it in one block vs jumping to extra methods.

* More linting issues, adjusting project code style prevent a few of these in the future.

* Added missing unit tests for `KeyFileDownloader` and fixed faulty behavior that was noticed during testing.

* CRUD (instrumentation) test for `KeyCacheDatabase`

* Remove unused `FileStorageHelper` and related constants+tests.

* Fix last3Hours unit test in deviceRelease mode, we need to explicitly enable debug for these tests.

* Until we have more information about the hashsum's format in the header, default to `ETag

* Split app config server API from diagnosis key download API,
and reintroduce caching for the app config download.

* Add test to check that the cache is used on flaky connections.

* Code changes based on PR comment, part #1.

* Code fluff, formatting.

* Handle download errors correctly.

* Refactoring:
* Remove unnecessary `currentDate` we always start with the newest date from the servers index.
* Make a specialised class for header validation

* Let legacy cache migration abort early, depending on whether the key dir exists.

* If we can't create the base directory for the key repo, throw an exception.

* Delete cache entry if a download fails.

* Fixed test regression due to refactoring.

* Consolidate staleness check into `getStale`

* Consolidate clean up for failed downloads into the download method.
Added tests to check that we delete the keycache entry if the download fails (which we didn't for hours :O!)

* Because the hour-mode uses caching too, we add an explicit button to the test menu that clears the cache.

* Add comment with reference to ticket regarding follow up on the other headers.

* Move expected storage size per country into a named constant.

Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>

* Implementation of tests for the interoperability countries selection screen (EXPOSUREAPP-2439) (#1140)

* Added initial set of viewModel tests

Signed-off-by: Kolya Opahle <k.opahle@sap.com>

* Fail tests on unexpected null.

Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>

Co-authored-by: Kolya Opahle <k.opahle@sap.com>
Co-authored-by: apopovsap <66370584+apopovsap@users.noreply.github.com>
Co-authored-by: Mert Safter <69803294+MertSafter@users.noreply.github.com>
Co-authored-by: Mert Safter <mert.safter@sap.com>
Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>
Co-authored-by: Matthias Urhahn <darken@darken.eu>

# Conflicts:
#	.idea/codeStyles/Project.xml
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/TestRiskLevelCalculationFragment.kt
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionQRCodeScanFragment.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionResultPositiveOtherWarningFragment.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionTanFragment.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/di/ApplicationComponent.kt

Change-Id: I0fd634bcf90159c4af6ac4631754484ae6952ffb

* Reduce boilerplate code for fragment view setup.

* Fix klint issue + change codestyle to match klint.

* Fixed regressions in `MainFragment` in `device` buildflavor

* Fix kotlin upgrade regression

* Disable KotlinNothingValueException in Kotlin 1.4 until kotest/mockk can handle it.

* Make "binding.lifecycleOwner = this" automatic.

* Addressed PR comments.

* build issue to due mixing branches

Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>

* DI: ViewModel (VDC) injection wiring + example in TestRiskLevelCalculation.kt

* Refactoring the TestRiskLevel fragment to demo our new viewmodel approach. Part1

* Refactoring the TestRiskLevel fragment to demo our new viewmodel approach. Part2

* Fix `Unexpected indentation (expected 4, actual 8)`

* Code fluff

* klint

* Remove empty test + klint

* Rename VDC to CWAViewModel

* Add example unit tests for the TestFragment's ViewModel.

* Revert AppInjector renaming.

* Comments explaining the code.

* Rename class to make it's purpose less confusing.

* Revert "Rename class to make it's purpose less confusing."

This reverts commit c80298bb

* Rename class to make it's purpose less confusing.

* Simpler ViewModel Injection example.

* klint <3

Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>

* New Scan Confirmation Texts Change (EXPOSUREAPP-2427) (#1097)

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>

* New Strings for Risikobegegnung mit niedrigem Risiko (EXPOSUREAPP-2462) (#1106)

* + new strings

* let the app not crash on other languages than DE

* values for lint and tests

* made bad test a comment

* removed unnecessary strings

* more string fixes

Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
Co-authored-by: Luka Harambasic <luka.harambasic@sap.com>

* Remove Cache Clearing to reduce CDN load on failing devices (EXPOSUREAPP-2405) (#1108)

* Remove Cache Clearing to reduce CDN load on failing devices. This ideally needs to be accompanied by a way to clear the cache manually and a way to identify more root causes of Transaction Failures.

Signed-off-by: d067928 <jakob.moeller@sap.com>

* Remove Files that failed for Key Retrieval

Only Remove Files from Cache that failed to download, instead of every file. This is accompanied ideally by no rollback in the Key Retrieval. We only delete the cache ref, the file will not be deleted as it is considered not present

Signed-off-by: d067928 <jakob.moeller@sap.com>

* Introduce dedicated QuotaCalculator for Unit Testing

Signed-off-by: d067928 <jakob.moeller@sap.com>

* Refactor QuotaCalculator for LocalData Property Access and Write Tests

Signed-off-by: d067928 <jakob.moeller@sap.com>

* Use Instant on the Device Read since this is not timezone specific

Signed-off-by: d067928 <jakob.moeller@sap.com>

* Add specific state for the quota calculation and dedicated rollback

Signed-off-by: d067928 <jakob.moeller@sap.com>

* PR Comments

Signed-off-by: d067928 <jakob.moeller@sap.com>

* Feature: Update low risk string (EXPOSUREAPP-1971) (#1125)

* Improve Explanation for "Risikobegegnung mit niedrigem Risiko" (EXPOSUREAPP-1971) (#1112)

* Adapt QuotaCalculatorTest to old JUnit4 API

Signed-off-by: d067928 <jakob.moeller@sap.com>

* [INTERNAL] Translation delivery: commit by LX Lab (#1132)

Change-Id: Ib76a9ea2b03163a05dd8b6acf2179262f9bcf5bf

* Removed ar & ru and updated defaults (#1133)

* Throw Exception in case we have a failed entry to ensure Abortion of the Transaction (EXPOSUREAPP-2405) (#1134)

* Throw Exception in case we have a failed entry to ensure Abortion of the Transaction.

Signed-off-by: d067928 <jakob.moeller@sap.com>

* Adjust test to not expect call to clear cache files

Signed-off-by: d067928 <jakob.moeller@sap.com>

* version bump to 1.3.1

* Reverted replaced wording (EXPOSUREAPP-2638) (#1153)

* Fix: No exposure with low risk so far

* Fixed klint issues (#1144)

* restored reverted replaced wording for lint

* https://github.com/corona-warn-app/cwa-app-android/pull/1153#discussion_r487801724



* fixed term

* Align TestFragment Crash behavior with background transaction crash behavior.

* Add logging mechanism to debug hotfix issue.

* Lint Resolvement, Nav Graph Issue clean, Enable Log for deviceForTesters, Correct Quota Tests due to now lacking exception

Signed-off-by: d067928 <jakob.moeller@sap.com>

Co-authored-by: Philipp Woessner <64482866+pwoessner@users.noreply.github.com>
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
Co-authored-by: Rituraj Sambherao <54317407+ritsam@users.noreply.github.com>
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Co-authored-by: chris-cwa <69595386+chris-cwa@users.noreply.github.com>
Co-authored-by: Luka Harambasic <luka.harambasic@sap.com>
Co-authored-by: SAP LX Lab Service Account <tmsatsls+github.com_service-tip-git@sap.com>
Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>

* initial commit of new fragment for symptom screen

* Added relevant strings for symptom screen. Started editing xml of initial symptom screen

* Addded 3 selection options within symptom screen

* button id name change to something more relevant

* ID changes to be something more relevant to symptom scenerio.

* Implemented symptom initial screen logic. Temporary nav for testing.

* CircleCI formatting

* Adapted interoperability test provided by apopov

* Added accessibilty announcement on resume, fixed navigation for main page

* circleCI indentation fix

* removed ar & ru and updated default strings

* Adaption to ViewModel logic. Not yet complete

Adaption to ViewModel logic, attempting to align with implementation done with some interoporibility tasks: reusable layout files, etc.

* More ViewModel transformation additions

* revert nav from test. Circle CI formatting changes

* Update SubmissionSymptomIntroductionFragment.kt

* Removed old fragment based test

* Will implement navigation during marry session.

* Update SubmissionViewModel.kt

* Calendar button selection screen + required strings

* Custom calendar view

* Accessibility improved

* introduced data types for symptoms

* represent date by long in millis

* new TransmissionRiskVector

* Constants and formatting

* Naming changes requested

* Better event naming

* Update fragment_submission_symptom_intro.xml

* Finishing calendar implementation - still need to implement calendar widget

Surrounding calendar submission UI - minus calednar widget
Necessary strings

* Merged introduction and calendar screen.

Created calendar fragment screen,
Finished calendar XML view
Added required entries for choices in SubmissionViewModel
Adjusted Formatters for button selection.
Changed nav graph.

* + todo

* CircleCI code style changes

* EXPERT STUFF

* Latest push for marry session

* replaced transaction risk vector

* update textcolor on symptom indication change

* update buttons by code

* code formatting

* Added logic for Negative and No Information buttons and adjusted xml view to be more aligned with design

Added logic for Negative and No Information buttons and adjusted xml view to be more aligned with design

* disable next button when state is null.

* + readability

* Calendar screen logic adapted for button selection

* extracted domain logic from prototype and from transaction

* - not used events

* joint improvements

* removed unused events

* Calendar unsetSelection added

* detekt rules changed and formatting

* - calendar view refactor: CalendarCalculator singleton introduced for batter testing capacity
- unit tests added

* detekt issues

* Colors and styles cleared

* fixed strings

* maintained unit tests

* adopted changes from main nav graph to device for testers nav graph

* reverted comment

* made start of symptoms nullable

* tests

* Adjusted navigation, fixed dark theme

* Update Project.xml

* use of postValue() in SubmissionViewModel.kt

* Added direction in tester nav graph

* improvements required by review

* moving companion

* moving companion

* moving companion

* fixed issues from partner review

* fixed issues from partner review

* fixed issues from partner review

* fixed issues from partner review

* fixed issues from partner review

* using utc

* edge case tests

* made inner class

* Refactored Symptoms Class Name (+data class)

* Change SubmissionViewModel scope to ensure that the same viewmodel is used to store submission data.

* extracted null check + log

Co-authored-by: Luka Harambasic <luka.harambasic@sap.com>
Co-authored-by: chris-cwa <chris.cwa.sap@gmail.com>
Co-authored-by: Alexander Alferov <a.alferov@sap.com>
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Co-authored-by: Matthias Urhahn <darken@darken.eu>
Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>

* update button in privacy string and update button string

* changed data privacy string

* adjusted layout direction and text (2549)

* Update strings.xml

adjusten komma point for submission_tan_error

# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionQRCodeScanFragment.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionResultPositiveOtherWarningFragment.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionTanFragment.kt

* update string

* update string

* update string

* updates location text and activated autolink

* updated string

* own layout for location to set the url

* added fallback if label isn't found in string

Co-authored-by: chris-cwa <chris.cwa.sap@gmail.com>

Co-authored-by: Mert Safter <mert.safter@sap.com>

Error Messages after scanning incorrect QR codes fixed

Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>

* fixed duplicate use of string

* klint

* + message for translators

* + message for translators

* fixed submission tan error dialog strings

* update string

Co-authored-by: Luka Harambasic <luka.harambasic@sap.com>
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>

* Update strings.xml

* Update strings.xml

* Update privacy_de.html

* Fix: No exposure with low risk so far

* Fixed klint issues (#1144)

* restored reverted replaced wording for lint

* https://github.com/corona-warn-app/cwa-app-android/pull/1153#discussion_r487801724



* fixed term

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

Co-authored-by: Matthias Urhahn <darken@darken.eu>

Co-authored-by: Matthias Urhahn <darken@darken.eu>

* Create delegated property to automatically handle Fragment view unbinding

* Add new file at the end of file

* Remove empty line

* Update error message

* Add missing imports for other flavors.

Co-authored-by: darken <darken@darken.eu>
Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>

Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>

* user warning if keys submission flow is inturrpted / cancelled

* default string values added for pipeline fix

* Warning Dialog strings updated

* applied the changes suggested in review

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

# Conflicts:
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/RiskLevelAndKeyRetrievalBenchmark.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/WebRequestBuilder.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/keycache/KeyCacheDao.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/keycache/KeyCacheRepository.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransactionTest.kt

* test for OnboardingFragment

* QR code stricter validations

* regex pattern improvement

* removed Obsolete test

* lint changes to fix pipeline issue

* logic refinement and test coverage improvement

* pipeline related fixes

* piepline related fixes : unnecessary test removed

* pipeline fixes and increased tests coverage

* QR code validation logic improvement

* detekt pipeline issue resolved

* pipeline issue Fix

* logic ovehaul and improvement for QRCode scans / validations

1, Data object for ScanResults
2. new Test for ScanResults
3. logic simplified

* removing unused imports from tests

* Small refactoring together with Rituraj.

* Adjust detekt, early abort via return is GOOD!

Co-authored-by: Matthias Urhahn <darken@darken.eu>
Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>