# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataBindingAdapters.kt
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/DataBindingAdaptersTest.kt

* Pump  dependencies versions

* Traget Android 11

* Fix lint errors

* Add method for failing binding

* Fix lint errors

* Fix more lint errors

* Move away from deprecated Handler constructor with no specified looper

* Use ResourcesCompat to retrieve drawables

* Replace  getDrawable with getDrawableCompat

* Fix unit test

* Fix content is not showing in Onboarding flow

* lint

* Fix lint failure

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

* Update strings.xml

* Update legal_strings.xml

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

 Fix typo in german and english strings for finland country name (EXPOSUREAPP-4565) (closes #2069) #2072 

* Add log censoring for diary locations, persons and QR code token.

* Fix divider not being hidden if bug report entry is hidden.

* Fix censor modules not being applied in succession if multiple modules match.

* Remove debug helper and address registration token PR issue

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

* Fix some Kotlin warning

* Klint

* lint

* Removed unused method formatEmptyString

* Moved formatColorDivider into layout

* Moved formatColorIcon into layout

* Removed unused FormatterSettingsHelper

* Removed leftovers of FormatterSettingsHelper

* Removed static app context from formatColor

* Removed unused formatDrawable

* Removed app context from FormatterSubmissionHelper

* Adjusted tests - formattersubmissionhelperTest

* Removed app context from FormatterInformationLegalHelper

* replaced dimen/match_constraint with 0dp

* fix - base on current 1.11.x

* fix for formattestTestResult call

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

This allows our internal logging to capture those errors too.

* cleanup - Removed useless menu class

* cleanup - Sort export case sensitive

* cleanup - Added extension clearAndAddAll

* Removed useless wrapping

* Better semantic

* cleanup - Added AbstractAdapter, Use AbstractAdapter

* stabledId returns it

* Removed useless wrapping

* Use BaseAdapter and VH for contact diary overview

* Removed useless constants

* merge resolve

* detekt & ktlint

* Cancel test result notification after submission finish (EXPOSUREAPP-4309)

* remove trailing comma to fix circleci check

* update tests

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

* Changed access of country list names

* Removed CachedString from Country items

* Linting

* Fix missing timestamp on TracingFailed card.
Remove risklevel requirement for showing the last submission timestamp on the TracingFailed card.
This requirement does not exist on the TracingDisabled card either.

* Rename variable.

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

Remove @dimen/match_constraint as it will be replaced by tooling with 0dp whenever used and thus adds noise. (#2055)

* Added TalkBack Support for toolbar in day screen

* Updated day strings to support all languages

* Update date format to support different languages in overview screen

* Linting

* Updated day screen - Title is now read automatically when opening the screen

* Removed unsused type announcement for accessibility

* reverted changes in localization

* linting

* Updated local specific date announcements

* Linting

* Updated creation of accessibility date

* Updated formatting

* replace with close button

* use toolbar

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

No illustration description for image on Background Priority settings screen (EXPOSUREAPP-4097) (#2031)

* added getter for illustration description in BackgroundPriorityState

* Added new string to other string files

* Removed unnecessary string entries

* Added actual string values.

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

Long methods are not generally bad and should be decided on a case by case basis in PR reviews.

- Get rid of windows backslash path warning for ENF aar dependency

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

* Initial draft for user accessible debug logs in production.

TODO: Sharing, Tests, Cleanup FileLoggerTree?

* Ready strings for translation.

* Log file compression for sharing (zip).

* Add log sharing

* Change how DebugLogger is initialized to make sure we can record issues that happen very early in the apps lifecycle.

* Add missing toolbar back arrow navigation.

* Fix initial delay for ui state emissions.

* Censor registration token.

* Adjust warning regarding sensitive data in debug logs.

* Use property injection instead of component getters.

* Hide option until greenlit.

* Add test for RegistrationTokenCensor

* Unit tests.

* Make unit test without triggerfile more specific.

* LINTs

* Fix missing injection provider in release mode.

* Fix regtoken censor if condition.

* Fix typos.

* Remove empty manifest specific to deviceForTesters build.

* Wait until log job is canceled before deleting log files.
Otherwise a race condition could lead to file creation after job cancellation.

* Replace runBlockingTest with runBlocking we don't need scheduler control and runBlockingTest is sometimes unreliable.

* Refactor FileSharing to use compat builder from androidx.

* Handle exceptions on debug log start()

* Print device infos when log is started.

* Text changes requested by UA

Co-authored-by: ralfgehrer <mail@ralfgehrer.com>