From b17786218fe5dc9df504fc971913a1b54d221e61 Mon Sep 17 00:00:00 2001
From: Mohamed Metwalli <mjamal.muhammad@gmail.com>
Date: Mon, 11 Jan 2021 16:05:00 +0100
Subject: [PATCH] Fix some Kotlin warnings(DEV) #2064
* Fix some Kotlin warning
* Klint
* lint
---
.../rki/coronawarnapp/bugreporting/debuglog/DebugLogger.kt | 2 +-
.../de/rki/coronawarnapp/bugreporting/debuglog/LogLine.kt | 3 +--
.../day/tabs/location/ContactDiaryLocationListViewModel.kt | 2 +-
.../ui/day/tabs/person/ContactDiaryPersonListViewModel.kt | 2 +-
.../ui/edit/ContactDiaryEditLocationsViewModel.kt | 2 +-
.../ui/edit/ContactDiaryEditPersonsViewModel.kt | 2 +-
.../ContactDiaryLocationBottomSheetDialogFragment.kt | 6 +-----
.../ContactDiaryLocationBottomSheetDialogViewModel.kt | 2 +-
.../person/ContactDiaryPersonBottomSheetDialogFragment.kt | 6 +-----
.../person/ContactDiaryPersonBottomSheetDialogViewModel.kt | 2 +-
.../tracing/ui/homecards/TracingProgressCard.kt | 2 +-
.../rki/coronawarnapp/ui/settings/start/SettingsFragment.kt | 2 +-
.../ui/settings/start/SettingsFragmentViewModel.kt | 3 +--
.../ui/settings/start/SettingsFragmentViewModelTest.kt | 4 ++--
.../rki/coronawarnapp/util/formatter/FormatterHelperTest.kt | 1 -
15 files changed, 15 insertions(+), 26 deletions(-)
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 da7e345cc..2f4e3c065 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 bbc527eee..defe6c2c2 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 8adf87a56..f015f8fec 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 1f88e2729..6c6db515a 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 c4a5dd4e1..10fee646b 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 d418c003a..5faebc22c 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 7cba35f93..af7f6db44 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 7e639168a..df1d4d017 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 182cfd19f..e0e470712 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 eff32df76..8eae6adf7 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 72585604f..62fbb89b9 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 a6f1a4359..e58605b3d 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 739de3502..e34a1a618 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 bfb8effa0..115d261ec 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 f5ac06d0c..ac20d28c3 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
--
GitLab