* Update from https://github.com/corona-warn-app/cwa-protocol-buffers/commit/9407efff72fa1fa8e55ce45809d2cea3447e6404

* Update from https://github.com/corona-warn-app/cwa-protocol-buffers/commit/4033ef872478e2d4b0d64becfaa33342616b92d4

* Update from https://github.com/corona-warn-app/cwa-protocol-buffers/commit/d8011ec8efba92d7aae3c5b50c24d3d43d256d38



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

Co-authored-by: BMItter <46747780+BMItter@users.noreply.github.com>

* Align behavior of toResolvingString with Context.getString

* Fix unit test mocking getString().

Co-authored-by: BMItter <46747780+BMItter@users.noreply.github.com>

Merge branch 1.14 into 1.15 (DEV), build repair 

* Refactor function to extension function

* Change scope of ContactDiaryExporter to @Reusable

* Move .toReadableDuration() into extension functions and add tests

* Use time stamper instead of LocalDate.now() in ContactDiaryOverviewViewModel.kt to improve testability

* Add test for the current contact diary export

* Move export logic from ContactDiaryOverviewViewModel.kt into ContactDiaryExporter.kt

* Create tests for new attributes

* Adapt ContactDiaryExporter.kt to also export the new attributes

* Fix long -> duration change issue

* Fix tests

* Fix instrumentation test

* Update contact_diary_strings.xml

* Integration with duration picker

* Test navigation to comment info fragment

* Navigation to comment info

* Duration text overview and tests fix

* Fix ContactDiaryOverviewViewModelTest.kt

* Fix ktlint issues

* Fix issue to not add blank values to export

* Fix focus shift due to dialog opening from triggering a text change update.

* Fixed dialog styling

* Fix focus shift due to dialog opening from triggering a text change update.

* changed coroutine scope

* linting

* linting

* Fix test

* Add org.jetbrains.kotlinx:kotlinx-coroutines-test dependency to androidTest to fix missing dependency

Co-authored-by: janetback <68653277+janetback@users.noreply.github.com>
Co-authored-by: Alexander Alferov <a.alferov@sap.com>
Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>
Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>
Co-authored-by: I502720 <axel.herbstreith@sap.com>

* comments

* persistence

* database

* revert unrelated changes

* revert unrelated changes

* detekt

* extract collector

* unused

* unit test donor

* klint

* unit tests

* unit tests and db test

* naming error

* unmock object

* clear and unmock object

* make static

* make static

* comments and additional tests

* inject probability

* check for new before insert

* Merge branch 'release/1.14.x' into feature/4819-exposure-window

# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/AnalyticsModule.kt

* fix test

* review comments

* review comments

* measure time for db insertion

* adjust test

* klint

* Add unit tests for Surveys.isConsentNeeded()

* Adress PR feedback: Add fixed timesource, Extend from BaseTest

Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>

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

Co-authored-by: Alex Paulescu <alex.paulescu@gmail.com>
Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>

* Removed trailing comma when elements from list were empty.

* Changed takeWhile to filter.

Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>

Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>
Co-authored-by: I502720 <axel.herbstreith@sap.com>

* Change name hint

* Onboarding data donation text changes (DEV)

* Revert name hint change

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

# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultavailable/SubmissionTestResultAvailableViewModel.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/warnothers/SubmissionResultPositiveOtherWarningNoConsentViewModel.kt
#	gradle.properties

* Cleanup screenshot export

* Chown dir pulled with sudo back to our user.

* $USER was empty?

* Doh, CircleCI doesn't keys with ENV Vars in config specific commands.

* Iterating

* Update config.yml

Co-authored-by: Mohamed Metwalli <Mohamed.Metwalli@sap.com>
Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>

* Un-comment TestDonor

* Rename to TestResultDonor

* Implement basic setup

* Handle donation conditions

* Collect test result metadata after user consent

* Move test-metadata to ViewModel and save risk level

* Use RiskLevelStorage

* Map RiskLevel according to specs

* Map some metadata

* klint

* formatting

* Save time at pending result received

* Refactoring

* Add unit tests

* lint

* Calculate hoursDifference based on test type

* Calculate hoursSinceHighRiskWarningAtTestRegistration

* Fix test

* Add more tests

* Calculate hoursSinceHighRiskWarningAtTestRegistration

* Rename

* Add comment

* Save test result at registration time

* Add logs

* Fix detekt

* Refactor testResultAtRegistration

* Add unit tests and refactor clearing the settings

* Add more unit tests

* Reformat

* Use timestamper

* Change flag

* Ignore flaky test

* Ignore flaky test

* Remove view model tests which cause sonar to fail all the time

* Clean on success

* Use config provided through request

* Create test result donor settings

* lint

* Revert test visibility

* Create a separate class for TestResult collection

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

* Cleanup clearAllMocks() and unmockAll() usage.

* If we call `MockKAnnotations.init(this)`, in "Before" then we don't need to clear the mocks in each "After" call, as the mocks will be replaced by new ones.

* Fix textreplace error.

* Split up BaseTest class for unit and instrumentation tests.

* Move  BaseTest and BaseTestInstrumentation to the right packages

* Update BaseTestInstrumentation.kt

* Move it back

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>
Co-authored-by: Mohamed Metwalli <Mohamed.Metwalli@sap.com>

* added padding

* added layout adaption to location screen

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

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

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

* Attributes view disappears when empty.

* Fixed lint.

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

* Generalize the lifecycle callback extension on views and extract it.

* Use `addOnWindowFocusChangeListener` to detect when the user puts the app into the background.

Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>

* Adjusted risk logic

* Added tests for various risk states

* Location to location

* adjusted testcases

* Added option to test high risk due to low risk encounters

* enhanced encounter json

* Fix test take

* test without mockkstatic for oberservation

* tests....

* test ci observation

* fix for circle CI cannot mokkstatic

* adjusted test to work again

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

Contact journal extension (main-feature-branch) (EXPOSUREAPP-4741)

Merge remote-tracking branch 'origin/feature/4741-contact-journal-extension-main' into feature/4741-contact-journal-extension-main

# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/adapter/ContactDiaryOverviewNestedAdapter.kt

* Added arguments for persons and locations on the diary homescreen.

* Adjusted instrumentation test.

* Cleaned up code.

* Changed textview to self closing.

# Conflicts:
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragmentViewModel.kt
#	Corona-Warn-App/src/deviceForTesters/res/navigation/test_nav_graph.xml
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/ContactDiaryDayViewModel.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/util/ContactDiaryExtensions.kt
#	Corona-Warn-App/src/main/res/navigation/contact_diary_nav_graph.xml
#	Corona-Warn-App/src/main/res/values-de/contact_diary_strings.xml
#	Corona-Warn-App/src/main/res/values-de/strings.xml
#	Corona-Warn-App/src/main/res/values/contact_diary_strings.xml
#	Corona-Warn-App/src/main/res/values/strings.xml

* Add app shortcut for contact diary (#2130)

* Fix ktlint issue (#2130)

* Fix merge: ContactDiary Activity > Fragment

* Introduce dynamic shortcuts

* Update Test Menu (Onboarding)

* Update Test Menu

* Handle onboarding

* Update strings

* App shortcut improvements

* Code formatting

* Update tests

* Use ShortcutManagerCompat instead of ShortcutManager

* Update contact diary shortcut icon

* Update test menu

* Onboarding refactoring (EXPOSUREAPP-4659) (#2398)

* Move NewRelease and DeltaOnboarding Fragments to OnboardingActivity

* Update method names

* Refresh shortcuts in non UI thread

* Use deeplinks for navigation

* Code cleaning and refactoring

* Update shortcut name after UA Feedback

Co-authored-by: PhilippNowak96 <dev@philipp-nowak.com>
Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>
Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>
Co-authored-by: ralfgehrer <mail@ralfgehrer.com>

* Analytics.kt should provide the current config to all DonorModule.kt in the donation request.
This prevents unnecessary config refreshes and raceconditions where the config may change mid process.

* Resolve error due to merge.