# Conflicts:
#	Corona-Warn-App/src/device/java/de/rki/coronawarnapp/ui/main/MainFragment.kt
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainFragment.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/riskdetails/RiskDetailsFragment.kt
#	Corona-Warn-App/src/main/res/values-de/strings.xml
#	Corona-Warn-App/src/main/res/values-pl/strings.xml
#	Corona-Warn-App/src/main/res/values/strings.xml
#	Corona-Warn-App/src/test/java/testhelpers/preferences/MockSharedPreferences.kt

* Move AppConfig related code into it's own package.
* Use "files" instead of "cache" for storing our AppConfigApiTest.
* Add "files" to "cache" migration.
* Refactor CDN related code into an independent "environment module".

TODO: UnitTests, Fallback behavior even if cached AppConfig is stale.

* Further structure refactoring and unit test for app config cache migration.

* Added config fallback behavior for all cases + additional tests.

* Improve code readability.

* First POC for multi-environment support.

* logic for ACME test Countries toggle button in Dev menu

* ACME Test Countries dev menu

* Additional clean up and refactoring on build constants.

* Cleaned up the test fragment a bit.

* Fixed detekt issue

* Fix flaky test that depends on build variant.

* Let the test fragment show us the actual environment we toggled to.

* Changes upon review

* Address PR comments.

Co-authored-by: Rituraj Sambherao <git.rituraj.sambherao@gmail.com>

Version code bump to 42

Perform data reset for users already affected by the encryption issues (EXPOSUREAPP-1851/EXPOSUREAPP-2958) (#1256)

* A reset mechanism that performs a data reset for those (and just those) already affected by the pre 1.4.0
encryption error. If encountered the preference and database file will be deleted, then we will retry
to generate an EncryptedSharedPreferences instance, and show the user a popup about what happened.

TODO: This still has placeholders for the popup dialog.

* Change detekt config.
Early returns help code readability if used as guard closes.

* Add final texts and fix missing dialog in other build flavors.

* Additional test that we also match nested exceptions.

* Fix incorrect shared preferences path.

* Make klint happy.

* Address PR comments.

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

Change-Id: I198b60dfc466c636a90644815e36f03aba51e7ab

* test enhancement for interop and countrylist, added liveDataTestExtension

* better test naming, removed one assert

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

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

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

* update text

* added hyphen

* EXPOSUREAPP-2865: Update default strings

* EXPOSUREAPP-2865: Fix Link language

* Added country list to submission of keys screen

* Ktlint changes

* Added missing  s

* Added text changes

* Removed file from wrong location

* Reverted back to old way of instantiating countryList in SubmissionViewModel

* Removed hardcoded spacing

* Changed country list text style from bold to paragraph size

* Added dimen everywhere and added back en string

Co-authored-by: Alexandru.Paulescu <alexandru.paulescu@sap.com>

Version code bump

Change-Id: I623bba4d9bb2a5b4eba70bc4fe6c22b8c9487cbf

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

Add the new local environment file `test_environments.json` to the .gitignore as it should not be checked in. (#1247)

* Add retry mechanism with backoff to EncryptedSharedPreferences creation.

* Increase default delays and make the actual delay a randomized value between the last and the new delay.

* Upgrade to "androidx.security:security-crypto:1.0.0-rc03"

* Further space retry delays.

* Unit tests for retry mechanism and factory init.

* klint

* Fixed flaky test.

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

* New note on interoperability

* Set new note only for onboarding delta interoperability

Interoperability: List of Countries can not be loaded for 1.5.x in new onboarding / interop (EXPOSUREAPP-2744) (#1232)

* interop nofetch riskdetails, corresponding layout and vector

* updated res to new no country spec

* nofetch fetch layouts

* Create include_interoperability_old.xml

* removed old stuff

* fixed Fixed include_interop_participating_countries_fetch for 1.5.x

* adjusted logic from old base to fit 1.5.x, Converted countryList to LiveData

* showing fetch or no fetch view in include_interoperability.xml, use github name as author

* cleanup & refactor, fixed layout switch issue, wip

* ids cleanup

* system settings delegation according to design spec

* improved countrylist handling for interopConfig Connectivity Settings

* updated string translation tags

* satisfy lint

* satisfy CircleCi

* fixed wrong layout visibility

* delta test disabled, referenced ids adjusted

* FormatHelper as requested

* fix capital letter

* updated risk details information body with new text and link (please check twice the text)

* Revert "updated risk details information body with new text and link (please check twice the text)"

This reverts commit 917fdc5715eeb9334dd98be24f522b185adf1cdd.

* missing link fixed for low exposure state risk details (draft)

* fixed link

* testable version for fixed link (on low exposure state)

* Fix not clickable link (#2883)

* fixed herlink convert input reference

* provide default link for encounter but green

* removed testcode for checking low risk exposure state

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

* Made hotline number clickable

- delcared textview clickable within xml layout
- reused dial logic from button and used for now clickable text

* removed synthetic import - now using binding instead.

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

* Move AppConfig related code into it's own package.
* Use "files" instead of "cache" for storing our AppConfigApiTest.
* Add "files" to "cache" migration.
* Refactor CDN related code into an independent "environment module".

TODO: UnitTests, Fallback behavior even if cached AppConfig is stale.

* Further structure refactoring and unit test for app config cache migration.

* Added config fallback behavior for all cases + additional tests.

* Improve code readability.

* Remove test TODO

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

Changed accessibility importance of switch to avoid overriding status announcement

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

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

* Make transaction timeout settable per transaction. Increase Risk Level Calc transaction

* Make timeout more readable

* updated and added strings

* added new textview

* text changes for existing user consent

* fixed typo

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

Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>

1.4.x into 1.5.x

# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/di/ApplicationComponent.kt
#	Corona-Warn-App/src/main/res/navigation/nav_graph.xml
#	Corona-Warn-App/src/main/res/values/strings.xml

* Import flag assets. Create init CountrySelectionList and Fragment

* Implement missing components. Create ViewModel and Repository for Interop

* fix wrong property usage

* Implement storage of selected countries

* Implement warn dialog

* Added navigation from country selection to tracing fragment

* Fixed lint errors

* Fix typo and build error

* Move navigation out of onResume

* Implement Warning dialog and do some code cleanup

* Begin of onboarding for Interoperability. Fix linting issues

* Implement onboarding for Interoperability (#1976)

* Implement skip path of interop screen in onboarding (#1976)

* Implement navigation logic for onBoarding (#1976)

* Fix linting issues

* Adjust country list and view to new UI (#2667)

* Merge OnboardingTracingFragment with country list (#2665)

* UI adjustments (#2665)

* Fix linting issues

* Implement Delta Onboarding logic (#2665)

* Adjust interoperability screens to new UI (#2730, #2733)

* Added navigation from country selection to tracing fragment

* Fix merge issues with interoperability branch

* Fix merge issues with interoperability branch

* Fix merge changes with 1.5.x branch

* Remove unused Formatter

* Remove import of unused Formatter

* Remove import of unused Formatter

* Fix linting issue

* Adjust UI to mock changes (#2730)

* Adjust fragment binding to new solution and code cleanup

* Adjust layout ids to guidelines. Comment strings.xml

* Moved back navigation event to ViewModel

* Move to DI and ViewModel navigation

* Improve accessibility

* Improve accessibility

* Adjusted UI to updated mockups. Clean-Up of InteroperabilityRepository and LocalData

* Refactoring and ViewModel use.

* Make detekt happy.

* Fix PR comments, typos, inline getString.

* Fix refactoring typo

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

* texts for interop user consent

* default values

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

* [INTERNAL] Translation delivery: commit by LX Lab

Change-Id: I819e9a5a620221a7267bb9737396fbb966852bb0

* [INTERNAL] Translation delivery: commit by LX Lab

Change-Id: I932bc1aa24d4ebe65681cf78c1f109266e695980

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