diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/DebugLogger.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/DebugLogger.kt index da7e345ccacd4f4f88a8c5fd4a938f8dd7827fbb..2f4e3c06558e0478ac895d7bef9c10447683edc7 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/DebugLogger.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/DebugLogger.kt @@ -152,7 +152,7 @@ object DebugLogger : DebugLoggerBase() { } private fun appendLogLine(line: LogLine) { - val formattedLine = line.format(context) + val formattedLine = line.format() runningLog.appendText(formattedLine, Charsets.UTF_8) } diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/LogLine.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/LogLine.kt index bbc527eee8dc99d4235407073c5e787cd2145c5d..defe6c2c2c9adb8ea2ab8ab01c6983a59ecc730d 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/LogLine.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/LogLine.kt @@ -1,6 +1,5 @@ package de.rki.coronawarnapp.bugreporting.debuglog -import android.content.Context import android.util.Log import org.joda.time.Instant @@ -12,7 +11,7 @@ data class LogLine( val throwable: Throwable? ) { - fun format(context: Context): String { + fun format(): String { val time = Instant.ofEpochMilli(timestamp) return "$time ${priorityLabel(priority)}/$tag: $message\n" } diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/ContactDiaryLocationListViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/ContactDiaryLocationListViewModel.kt index 8adf87a56a285ce1a6661fc1098c5d63f63a6861..f015f8fec6ff0bb6e17a0b721da710ef3ec2146a 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/ContactDiaryLocationListViewModel.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/ContactDiaryLocationListViewModel.kt @@ -24,7 +24,7 @@ class ContactDiaryLocationListViewModel @AssistedInject constructor( @Assisted selectedDay: String, private val contactDiaryRepository: ContactDiaryRepository ) : CWAViewModel(dispatcherProvider = dispatcherProvider) { - private val coroutineExceptionHandler = CoroutineExceptionHandler { coroutineContext, ex -> + private val coroutineExceptionHandler = CoroutineExceptionHandler { _, ex -> ex.report(ExceptionCategory.INTERNAL, TAG) } diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/person/ContactDiaryPersonListViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/person/ContactDiaryPersonListViewModel.kt index 1f88e272985d328121cde26ee4060c4f8da1ccb7..6c6db515aa028b0350d00097e0e761b8396a5102 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/person/ContactDiaryPersonListViewModel.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/person/ContactDiaryPersonListViewModel.kt @@ -24,7 +24,7 @@ class ContactDiaryPersonListViewModel @AssistedInject constructor( @Assisted selectedDay: String, private val contactDiaryRepository: ContactDiaryRepository ) : CWAViewModel(dispatcherProvider = dispatcherProvider) { - private val coroutineExceptionHandler = CoroutineExceptionHandler { coroutineContext, ex -> + private val coroutineExceptionHandler = CoroutineExceptionHandler { _, ex -> ex.report(ExceptionCategory.INTERNAL, TAG) } diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditLocationsViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditLocationsViewModel.kt index c4a5dd4e1555d3af1399ca77f501bfe8d41d32a5..10fee646bb08563435b849a06d1095d50491bd10 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditLocationsViewModel.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditLocationsViewModel.kt @@ -19,7 +19,7 @@ class ContactDiaryEditLocationsViewModel @AssistedInject constructor( private val contactDiaryRepository: ContactDiaryRepository, dispatcherProvider: DispatcherProvider ) : CWAViewModel(dispatcherProvider = dispatcherProvider) { - private val coroutineExceptionHandler = CoroutineExceptionHandler { coroutineContext, ex -> + private val coroutineExceptionHandler = CoroutineExceptionHandler { _, ex -> ex.report(ExceptionCategory.INTERNAL, TAG) } diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditPersonsViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditPersonsViewModel.kt index d418c003a4c83a64fbd4a0644bbe1c96b842df69..5faebc22c02b5f81740782609bb8d727030afeec 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditPersonsViewModel.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditPersonsViewModel.kt @@ -31,7 +31,7 @@ class ContactDiaryEditPersonsViewModel @AssistedInject constructor( val isListVisible = contactDiaryRepository.people.map { it.isNotEmpty() } .asLiveData(dispatcherProvider.IO) - private val coroutineExceptionHandler = CoroutineExceptionHandler { coroutineContext, ex -> + private val coroutineExceptionHandler = CoroutineExceptionHandler { _, ex -> ex.report(ExceptionCategory.INTERNAL, TAG) } diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/location/ContactDiaryLocationBottomSheetDialogFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/location/ContactDiaryLocationBottomSheetDialogFragment.kt index 7cba35f931a1c13aded403df63326eeafc4373f5..af7f6db44b2bfd9cf382e2e0c4ad8eb93563a37b 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/location/ContactDiaryLocationBottomSheetDialogFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/location/ContactDiaryLocationBottomSheetDialogFragment.kt @@ -66,7 +66,7 @@ class ContactDiaryLocationBottomSheetDialogFragment : BottomSheetDialogFragment( viewModel.textChanged(it.toString()) } - binding.contactDiaryLocationBottomSheetTextInputEditText.setOnEditorActionListener { v, actionId, event -> + binding.contactDiaryLocationBottomSheetTextInputEditText.setOnEditorActionListener { _, actionId, _ -> return@setOnEditorActionListener when (actionId) { EditorInfo.IME_ACTION_DONE -> { if (viewModel.isValid.value == true) { @@ -90,10 +90,6 @@ class ContactDiaryLocationBottomSheetDialogFragment : BottomSheetDialogFragment( } } - override fun onPause() { - super.onPause() - } - override fun onDestroyView() { super.onDestroyView() _binding = null diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/location/ContactDiaryLocationBottomSheetDialogViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/location/ContactDiaryLocationBottomSheetDialogViewModel.kt index 7e639168a24a0b7d32d3c84daa383cbb88c43a09..df1d4d017933dfdc0c76c4c8adae18847e2b1dfe 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/location/ContactDiaryLocationBottomSheetDialogViewModel.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/location/ContactDiaryLocationBottomSheetDialogViewModel.kt @@ -25,7 +25,7 @@ class ContactDiaryLocationBottomSheetDialogViewModel @AssistedInject constructor @Assisted private val addedAt: String?, private val contactDiaryRepository: ContactDiaryRepository ) : CWAViewModel(dispatcherProvider = dispatcherProvider) { - private val coroutineExceptionHandler = CoroutineExceptionHandler { coroutineContext, ex -> + private val coroutineExceptionHandler = CoroutineExceptionHandler { _, ex -> shouldClose.postValue(null) ex.report(ExceptionCategory.INTERNAL, TAG) } diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/person/ContactDiaryPersonBottomSheetDialogFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/person/ContactDiaryPersonBottomSheetDialogFragment.kt index 182cfd19f839b4d38083ec555b1c0ef7520245d7..e0e470712e92be4f54763c1d9e553e3c36beced3 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/person/ContactDiaryPersonBottomSheetDialogFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/person/ContactDiaryPersonBottomSheetDialogFragment.kt @@ -66,7 +66,7 @@ class ContactDiaryPersonBottomSheetDialogFragment : BottomSheetDialogFragment(), viewModel.textChanged(it.toString()) } - binding.contactDiaryPersonBottomSheetTextInputEditText.setOnEditorActionListener { v, actionId, event -> + binding.contactDiaryPersonBottomSheetTextInputEditText.setOnEditorActionListener { _, actionId, _ -> return@setOnEditorActionListener when (actionId) { IME_ACTION_DONE -> { if (viewModel.isValid.value == true) { @@ -90,10 +90,6 @@ class ContactDiaryPersonBottomSheetDialogFragment : BottomSheetDialogFragment(), } } - override fun onPause() { - super.onPause() - } - override fun onDestroyView() { super.onDestroyView() _binding = null diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/person/ContactDiaryPersonBottomSheetDialogViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/person/ContactDiaryPersonBottomSheetDialogViewModel.kt index eff32df76a4896a7429461d55ca31470b4b00a53..8eae6adf7fbe1cea611928bcbfd1e02dd53cc7af 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/person/ContactDiaryPersonBottomSheetDialogViewModel.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/person/ContactDiaryPersonBottomSheetDialogViewModel.kt @@ -25,7 +25,7 @@ class ContactDiaryPersonBottomSheetDialogViewModel @AssistedInject constructor( @Assisted private val addedAt: String?, private val contactDiaryRepository: ContactDiaryRepository ) : CWAViewModel(dispatcherProvider = dispatcherProvider) { - private val coroutineExceptionHandler = CoroutineExceptionHandler { coroutineContext, ex -> + private val coroutineExceptionHandler = CoroutineExceptionHandler { _, ex -> shouldClose.postValue(null) ex.report(ExceptionCategory.INTERNAL, TAG) } diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/homecards/TracingProgressCard.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/homecards/TracingProgressCard.kt index 72585604fec9c39cd0e9de74278df0d0e86b5723..62fbb89b928a5cdf9af801524843a94d0222078e 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/homecards/TracingProgressCard.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/homecards/TracingProgressCard.kt @@ -20,7 +20,7 @@ class TracingProgressCard( } override val onBindData: TracingContentProgressViewBinding.(item: Item, payloads: List<Any>) -> Unit = - { item, payloads -> + { item, _ -> itemView.backgroundTintMode = PorterDuff.Mode.SRC_OVER itemView.backgroundTintList = ColorStateList.valueOf(item.state.getContainerColor(context)) state = item.state diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/start/SettingsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/start/SettingsFragment.kt index a6f1a4359257ed00a5c89c951e25bf144afb544a..e58605b3d71f4294269e78980ca1f7af12582622 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/start/SettingsFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/start/SettingsFragment.kt @@ -35,7 +35,7 @@ class SettingsFragment : Fragment(R.layout.fragment_settings), AutoInject { vm.notificationState.observe2(this) { binding.notificationState = it } - vm.backgroundPrioritystate.observe2(this) { + vm.backgroundPriorityState.observe2(this) { binding.backgroundState = it } setButtonOnClickListener() diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/start/SettingsFragmentViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/start/SettingsFragmentViewModel.kt index 739de3502b471b1ea9ccca012bfa596e98564b43..e34a1a618da082c975a691ca5d6001169e53fc60 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/start/SettingsFragmentViewModel.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/start/SettingsFragmentViewModel.kt @@ -25,7 +25,6 @@ class SettingsFragmentViewModel @AssistedInject constructor( .map { it.toSettingsTracingState() } .asLiveData(dispatcherProvider.Default) - // (settingsViewModel.isNotificationsEnabled(), settingsViewModel.isNotificationsRiskEnabled(), settingsViewModel.isNotificationsTestEnabled())}" val notificationState: LiveData<SettingsNotificationState> = combine( notificationSettings.isNotificationsEnabled, notificationSettings.isNotificationsRiskEnabled, @@ -38,7 +37,7 @@ class SettingsFragmentViewModel @AssistedInject constructor( ) }.asLiveData(dispatcherProvider.Default) - val backgroundPrioritystate: LiveData<SettingsBackgroundState> = + val backgroundPriorityState: LiveData<SettingsBackgroundState> = backgroundModeStatus.isIgnoringBatteryOptimizations .map { SettingsBackgroundState((it)) } .asLiveData(dispatcherProvider.Default) diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/settings/start/SettingsFragmentViewModelTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/settings/start/SettingsFragmentViewModelTest.kt index bfb8effa019724cdfa0a6b2dc6f065b135ed96aa..115d261ecf50446fd5532d62f8de0ebb4fa8d8fd 100644 --- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/settings/start/SettingsFragmentViewModelTest.kt +++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/settings/start/SettingsFragmentViewModelTest.kt @@ -79,8 +79,8 @@ class SettingsFragmentViewModelTest : BaseTest() { @Test fun `background priority status is forwarded`() { createInstance().apply { - backgroundPrioritystate.observeForever { } - backgroundPrioritystate.value shouldBe SettingsBackgroundState( + backgroundPriorityState.observeForever { } + backgroundPriorityState.value shouldBe SettingsBackgroundState( isEnabled = true ) } diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterHelperTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterHelperTest.kt index f5ac06d0c7201774cf32cabedb31d2053f24ea96..ac20d28c39ea966cfd3843e785ff97e2a28ea1cf 100644 --- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterHelperTest.kt +++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterHelperTest.kt @@ -13,7 +13,6 @@ import io.mockk.mockkObject import io.mockk.mockkStatic import io.mockk.unmockkAll import org.hamcrest.CoreMatchers.`is` -import org.hamcrest.CoreMatchers.equalTo import org.hamcrest.MatcherAssert.assertThat import org.junit.After import org.junit.Before