From d43c92bedc2da7fc5978a1d17cebf81f82a5ee53 Mon Sep 17 00:00:00 2001
From: Mohamed <mohamed.metwalli@sap.com>
Date: Mon, 12 Apr 2021 17:51:52 +0200
Subject: [PATCH] Clean up (DEV) (#2802)
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
---
Corona-Warn-App/build.gradle | 3 ++-
.../test/appconfig/ui/AppConfigTestFragment.kt | 1 +
.../test/crash.ui/SettingsCrashReportViewModel.kt | 2 +-
.../TestRiskLevelCalculationFragmentCWAViewModel.kt | 1 +
.../datadonation/safetynet/AttestationContainer.kt | 12 ++++++------
.../storage/repo/DefaultTraceLocationRepository.kt | 8 ++++++--
.../receiver/ExposureStateUpdateReceiver.kt | 1 +
.../adapter/category/TraceLocationCategory.kt | 3 ++-
.../organizer/create/TraceLocationCreateFragment.kt | 4 ++--
.../util/device/DefaultSystemInfoProvider.kt | 3 +--
.../formatter/FormatterInformationLegalHelper.kt | 4 +---
.../src/main/res/layout/include_contact_form.xml | 4 ++--
12 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/Corona-Warn-App/build.gradle b/Corona-Warn-App/build.gradle
index 89dce2971..25be009f4 100644
--- a/Corona-Warn-App/build.gradle
+++ b/Corona-Warn-App/build.gradle
@@ -173,7 +173,8 @@ android {
"-Xno-kotlin-nothing-value-exception",
"-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
"-Xuse-experimental=kotlinx.coroutines.FlowPreview",
- "-Xuse-experimental=kotlin.time.ExperimentalTime"
+ "-Xuse-experimental=kotlin.time.ExperimentalTime",
+ "-Xopt-in=kotlin.RequiresOptIn"
]
}
}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/appconfig/ui/AppConfigTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/appconfig/ui/AppConfigTestFragment.kt
index 9aa9ce21d..c151d90a7 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/appconfig/ui/AppConfigTestFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/appconfig/ui/AppConfigTestFragment.kt
@@ -28,6 +28,7 @@ class AppConfigTestFragment : Fragment(R.layout.fragment_test_appconfig), AutoIn
private val timeFormatter = ISODateTimeFormat.dateTime()
.withZone(DateTimeZone.forID("Europe/Berlin"))
+ @Suppress("DEPRECATION")
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/crash.ui/SettingsCrashReportViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/crash.ui/SettingsCrashReportViewModel.kt
index b02e7a18b..0b43e0de5 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/crash.ui/SettingsCrashReportViewModel.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/crash.ui/SettingsCrashReportViewModel.kt
@@ -31,7 +31,7 @@ class SettingsCrashReportViewModel @AssistedInject constructor(
fun simulateException() {
try {
- val a = 2 / 0
+ throw RuntimeException("Test crash reporting")
} catch (e: Exception) {
Timber.e(e, "Msg: ${e.message}")
e.reportProblem(SettingsCrashReportViewModel::class.java.simpleName, e.message)
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt
index ed246e65b..d8968b77d 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt
@@ -104,6 +104,7 @@ class TestRiskLevelCalculationFragmentCWAViewModel @AssistedInject constructor(
.appendLine("Number of Days With Low Risk: $numberOfDaysWithLowRisk")
.toString()
+ @Suppress("DEPRECATION")
val backendParameters = appConfigProvider
.currentConfig
.map { it.rawConfig.riskCalculationParameters.toString() }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/safetynet/AttestationContainer.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/safetynet/AttestationContainer.kt
index dcf91e1f6..c0d63aa17 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/safetynet/AttestationContainer.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/safetynet/AttestationContainer.kt
@@ -16,31 +16,31 @@ internal data class AttestationContainer(
safetyNetJws = report.jwsResult
}.build()
- override fun requirePass(reqs: SafetyNetRequirements) {
- Timber.v("requirePass(%s)", reqs)
+ override fun requirePass(requirements: SafetyNetRequirements) {
+ Timber.v("requirePass(%s)", requirements)
- if (reqs.requireBasicIntegrity && !report.basicIntegrity) {
+ if (requirements.requireBasicIntegrity && !report.basicIntegrity) {
throw SafetyNetException(
Type.BASIC_INTEGRITY_REQUIRED,
"Requirement 'basicIntegrity' not met (${report.advice})."
)
}
- if (reqs.requireCTSProfileMatch && !report.ctsProfileMatch) {
+ if (requirements.requireCTSProfileMatch && !report.ctsProfileMatch) {
throw SafetyNetException(
Type.CTS_PROFILE_MATCH_REQUIRED,
"Requirement 'ctsProfileMatch' not met (${report.advice})."
)
}
- if (reqs.requireBasicIntegrity && !report.evaluationTypes.contains("BASIC")) {
+ if (requirements.requireBasicIntegrity && !report.evaluationTypes.contains("BASIC")) {
throw SafetyNetException(
Type.EVALUATION_TYPE_BASIC_REQUIRED,
"Evaluation type 'BASIC' not met (${report.advice})."
)
}
- if (reqs.requireEvaluationTypeHardwareBacked && !report.evaluationTypes.contains("HARDWARE_BACKED")) {
+ if (requirements.requireEvaluationTypeHardwareBacked && !report.evaluationTypes.contains("HARDWARE_BACKED")) {
throw SafetyNetException(
Type.EVALUATION_TYPE_HARDWARE_BACKED_REQUIRED,
"Evaluation type 'HARDWARE_BACKED' not met (${report.advice})."
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt
index 56463d80c..b0c5f879d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt
@@ -32,11 +32,15 @@ class DefaultTraceLocationRepository @Inject constructor(
traceLocationDatabase.traceLocationDao()
}
+ /**
+ * Reruns [TraceLocation] for [id]
+ * @throws [IllegalArgumentException] if location not found
+ */
override suspend fun traceLocationForId(id: Long): TraceLocation {
- val checkIn = traceLocationDao.entryForId(id)
+ val traceLocationEntity = traceLocationDao.entryForId(id)
?: throw IllegalArgumentException("No traceLocation found for ID=$id")
- return checkIn.toTraceLocation()
+ return traceLocationEntity.toTraceLocation()
}
/**
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/receiver/ExposureStateUpdateReceiver.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/receiver/ExposureStateUpdateReceiver.kt
index 72a049c16..6005f4f3c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/receiver/ExposureStateUpdateReceiver.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/receiver/ExposureStateUpdateReceiver.kt
@@ -51,6 +51,7 @@ class ExposureStateUpdateReceiver : BroadcastReceiver() {
scope.launch(context = scope.coroutineContext) {
try {
+ @Suppress("DEPRECATION")
intent.getStringExtra(EXTRA_TOKEN)?.let {
Timber.tag(TAG).w("Received unknown token from ENF: %s", it)
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/category/TraceLocationCategory.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/category/TraceLocationCategory.kt
index 31f49804d..ffcb22118 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/category/TraceLocationCategory.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/category/TraceLocationCategory.kt
@@ -19,6 +19,7 @@ import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.CategoryItem
import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.category.TraceLocationUIType.EVENT
import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.category.TraceLocationUIType.LOCATION
+import kotlinx.parcelize.IgnoredOnParcel
import kotlinx.parcelize.Parcelize
@Parcelize
@@ -28,7 +29,7 @@ data class TraceLocationCategory(
@StringRes val title: Int,
@StringRes val subtitle: Int? = null
) : CategoryItem, Parcelable {
- override val stableId = hashCode().toLong()
+ @IgnoredOnParcel override val stableId = hashCode().toLong()
}
enum class TraceLocationUIType {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateFragment.kt
index 8c2cee883..385d82615 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateFragment.kt
@@ -202,7 +202,7 @@ class TraceLocationCreateFragment : Fragment(R.layout.trace_location_create_frag
private fun showDurationPicker() {
DurationPicker.Builder()
- .duration(viewModel.checkInLength?.toContactDiaryFormat() ?: "")
+ .duration(viewModel.checkInLength.toContactDiaryFormat())
.title(getString(R.string.tracelocation_organizer_add_event_length_of_stay))
.build()
.apply {
@@ -216,7 +216,7 @@ class TraceLocationCreateFragment : Fragment(R.layout.trace_location_create_frag
override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(
outState.apply {
- putLong(LENGTH_OF_STAY, viewModel.checkInLength?.standardMinutes ?: 0L)
+ putLong(LENGTH_OF_STAY, viewModel.checkInLength.standardMinutes)
putSerializable(BEGIN, viewModel.begin)
putSerializable(END, viewModel.end)
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/device/DefaultSystemInfoProvider.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/device/DefaultSystemInfoProvider.kt
index 5a8fccf5f..8712735b3 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/device/DefaultSystemInfoProvider.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/device/DefaultSystemInfoProvider.kt
@@ -1,12 +1,11 @@
package de.rki.coronawarnapp.util.device
-import android.content.Context
import android.content.res.Resources
import android.os.Build
import java.util.Locale
import javax.inject.Inject
-class DefaultSystemInfoProvider @Inject constructor(context: Context) : SystemInfoProvider {
+class DefaultSystemInfoProvider @Inject constructor() : SystemInfoProvider {
override val locale: Locale
get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterInformationLegalHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterInformationLegalHelper.kt
index 6a8e220b8..72bdddee2 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterInformationLegalHelper.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterInformationLegalHelper.kt
@@ -2,7 +2,6 @@
package de.rki.coronawarnapp.util.formatter
-import android.content.Context
import android.view.View
import de.rki.coronawarnapp.ui.information.InformationLegalPresentation
import de.rki.coronawarnapp.util.device.DefaultSystemInfoProvider
@@ -15,10 +14,9 @@ import de.rki.coronawarnapp.util.device.DefaultSystemInfoProvider
*/
fun formatVisibilityLanguageBased(
- context: Context,
isContactFormView: Boolean?
): Int {
- InformationLegalPresentation(DefaultSystemInfoProvider(context)).apply {
+ InformationLegalPresentation(DefaultSystemInfoProvider()).apply {
if (!showBackupLinkToContactForm) {
return if (isContactFormView == true) {
View.VISIBLE
diff --git a/Corona-Warn-App/src/main/res/layout/include_contact_form.xml b/Corona-Warn-App/src/main/res/layout/include_contact_form.xml
index 0f3654c19..0af8211cc 100644
--- a/Corona-Warn-App/src/main/res/layout/include_contact_form.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_contact_form.xml
@@ -28,7 +28,7 @@
android:linksClickable="true"
android:text="@string/information_legal_subtitle_contact_label"
android:textColorLink="@color/colorTextTint"
- android:visibility="@{FormatterInformationLegalHelper.formatVisibilityLanguageBased(context, true)}"
+ android:visibility="@{FormatterInformationLegalHelper.formatVisibilityLanguageBased(true)}"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -42,7 +42,7 @@
android:linksClickable="true"
android:text="@string/information_legal_subtitle_contact_form_non_en_de"
android:textColorLink="@color/colorTextTint"
- android:visibility="@{FormatterInformationLegalHelper.formatVisibilityLanguageBased(context, false)}"
+ android:visibility="@{FormatterInformationLegalHelper.formatVisibilityLanguageBased(false)}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/information_legal_contact_form" />
--
GitLab