Clean up (DEV) (#2802)

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

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"
             ]
         }
     }

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)
 

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)

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() }

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})."

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()
     }
 
     /**

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)
                 }

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 {

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)
             }

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/device/DefaultSystemInfoProvider.kt

 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) {

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

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" />