Merge branch 'release/1.11.x' into feature/2950-home-screenshots

Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_appconfig.xml

@@ -14,7 +14,7 @@
         android:paddingBottom="32dp">
 
         <LinearLayout
-            style="@style/card"
+            style="@style/Card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/spacing_tiny"
@@ -74,7 +74,7 @@
         </LinearLayout>
 
         <LinearLayout
-            style="@style/card"
+            style="@style/Card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/spacing_tiny"
@@ -93,7 +93,7 @@
         </LinearLayout>
 
         <LinearLayout
-            style="@style/card"
+            style="@style/Card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/spacing_tiny"
@@ -109,4 +109,4 @@
         </LinearLayout>
 
     </LinearLayout>
-</androidx.core.widget.NestedScrollView>
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file

Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_contact_diary.xml

@@ -15,7 +15,7 @@
         android:paddingBottom="32dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            style="@style/card"
+            style="@style/Card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/spacing_tiny"
@@ -76,7 +76,7 @@
 
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            style="@style/card"
+            style="@style/Card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/spacing_tiny">
@@ -196,7 +196,7 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            style="@style/card"
+            style="@style/Card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/spacing_tiny">
@@ -223,4 +223,4 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </LinearLayout>
-</androidx.core.widget.NestedScrollView>
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file

Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_debugoptions.xml

@@ -17,7 +17,7 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/debug_container"
-                style="@style/card"
+                style="@style/Card"
                 android:layout_margin="@dimen/spacing_tiny"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
@@ -57,7 +57,7 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/environment_container"
-                style="@style/card"
+                style="@style/Card"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/spacing_tiny">

Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_deviceinfo.xml

@@ -16,7 +16,7 @@
             android:orientation="vertical">
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/gms_container"
-                style="@style/card"
+                style="@style/Card"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/spacing_tiny">
@@ -57,7 +57,7 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/tracing_container"
-                style="@style/card"
+                style="@style/Card"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/spacing_tiny">

Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_keydownload.xml

@@ -15,7 +15,7 @@
         android:paddingBottom="32dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            style="@style/card"
+            style="@style/Card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/spacing_tiny"
@@ -85,4 +85,4 @@
             android:layout_height="match_parent" />
 
     </LinearLayout>
-</androidx.core.widget.NestedScrollView>
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file

Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_risk_level_calculation.xml

@@ -16,7 +16,7 @@
 
             <LinearLayout
                 android:id="@+id/environment_container"
-                style="@style/card"
+                style="@style/Card"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">

Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_submission.xml

@@ -15,7 +15,7 @@
         android:paddingBottom="32dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            style="@style/card"
+            style="@style/Card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/spacing_tiny"
@@ -67,7 +67,7 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/tek_history"
-            style="@style/card"
+            style="@style/Card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/spacing_tiny">
@@ -140,4 +140,4 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </LinearLayout>
-</androidx.core.widget.NestedScrollView>
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file

Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_task_controller.xml

@@ -15,7 +15,7 @@
         android:orientation="vertical">
 
         <LinearLayout
-            style="@style/card"
+            style="@style/Card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/spacing_tiny"
@@ -40,7 +40,7 @@
         </LinearLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            style="@style/card"
+            style="@style/Card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/spacing_tiny"
@@ -92,7 +92,7 @@
             android:layout_height="wrap_content" />
 
         <LinearLayout
-            style="@style/card"
+            style="@style/Card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/spacing_tiny"
@@ -115,4 +115,4 @@
         </LinearLayout>
 
     </LinearLayout>
-</androidx.core.widget.NestedScrollView>
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file

Corona-Warn-App/src/deviceForTesters/res/layout/view_crashreport_list_item.xml

@@ -25,7 +25,7 @@
         android:paddingBottom="2dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            style="@style/card"
+            style="@style/Card"
             android:layout_width="390dp"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/spacing_tiny"
@@ -71,4 +71,4 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </LinearLayout>
-</layout>
+</layout>
\ No newline at end of file

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

@@ -2,9 +2,11 @@ package de.rki.coronawarnapp.util
 
 import android.app.Application
 import android.os.Build
+import androidx.annotation.VisibleForTesting
 import de.rki.coronawarnapp.BuildConfig
 import de.rki.coronawarnapp.bugreporting.debuglog.DebugLogger
 import de.rki.coronawarnapp.util.debug.FileLogger
+import de.rki.coronawarnapp.util.debug.UncaughtExceptionLogger
 import de.rki.coronawarnapp.util.di.ApplicationComponent
 import timber.log.Timber
 
@@ -21,6 +23,8 @@ object CWADebug {
             fileLogger = FileLogger(application)
         }
 
+        setupExceptionHandler()
+
         DebugLogger.init(application)
 
         logDeviceInfos()
@@ -57,4 +61,12 @@ object CWADebug {
         Timber.i("CWA flavor: %s (%s)", BuildConfig.FLAVOR, BuildConfig.BUILD_TYPE)
         Timber.i("Build.FINGERPRINT: %s", Build.FINGERPRINT)
     }
+
+    /**
+     * Allow internal logging via `DebugLogger` to log stacktraces for uncaught exceptions.
+     */
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    internal fun setupExceptionHandler() {
+        UncaughtExceptionLogger.wrapCurrentHandler()
+    }
 }

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/debug/UncaughtExceptionLogger.kt

+package de.rki.coronawarnapp.util.debug
+
+import timber.log.Timber
+
+class UncaughtExceptionLogger(
+    private val wrappedHandler: Thread.UncaughtExceptionHandler?
+) : Thread.UncaughtExceptionHandler {
+
+    init {
+        Timber.v("Wrapping exception handler: %s", wrappedHandler)
+    }
+
+    override fun uncaughtException(thread: Thread, error: Throwable) {
+        Timber.tag(thread.name).e(error, "Uncaught exception!")
+        wrappedHandler?.uncaughtException(thread, error)
+    }
+
+    companion object {
+        fun wrapCurrentHandler() = UncaughtExceptionLogger(Thread.getDefaultUncaughtExceptionHandler()).also {
+            Thread.setDefaultUncaughtExceptionHandler(it)
+        }
+    }
+}

Corona-Warn-App/src/main/res/drawable/grey_card_ripple.xml

+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/colorSurface2Pressed" />
+            <corners android:radius="@dimen/radius_card" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/radius_card" />
+            <solid android:color="@color/colorSurface2" />
+        </shape>
+    </item>
+</ripple>

Corona-Warn-App/src/main/res/layout/contact_diary_privacy_card.xml

@@ -4,7 +4,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/contact_diary_privacy_card"
-        style="@style/cardGrey"
+        style="@style/GreyCard"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="@dimen/spacing_normal"

Corona-Warn-App/src/main/res/layout/fragment_submission_dispatcher.xml

@@ -85,7 +85,6 @@
                     app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
                     app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_needs_testing_text" />
 
-
                 <TextView
                     android:id="@+id/submission_dispatcher_already_positive_text"
                     style="@style/headline6"

Corona-Warn-App/src/main/res/layout/include_16_years.xml

@@ -4,7 +4,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/sixteen_years"
-        style="@style/card"
+        style="@style/Card"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/spacing_small"
@@ -40,4 +40,4 @@
             app:layout_constraintTop_toBottomOf="@+id/sixteen_years_headline" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</layout>
\ No newline at end of file

Corona-Warn-App/src/main/res/layout/include_dispatcher_card.xml

@@ -22,8 +22,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/dispatcher_card"
-        style="@style/cardGrey"
-        android:foreground="?selectableItemBackground"
+        style="@style/GreyCard.Ripple"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:focusable="true"

Corona-Warn-App/src/main/res/layout/include_privacy_card.xml

@@ -4,7 +4,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/privacy_card"
-        style="@style/cardGrey"
+        style="@style/GreyCard"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="@dimen/spacing_normal"
@@ -35,4 +35,4 @@
             app:layout_constraintTop_toBottomOf="@+id/privacy_card_title" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</layout>
\ No newline at end of file

Corona-Warn-App/src/main/res/layout/include_privacy_card_no_consent.xml

@@ -4,7 +4,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/privacy_card"
-        style="@style/cardGrey"
+        style="@style/GreyCard"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="@dimen/spacing_normal"
@@ -61,4 +61,4 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-</layout>
+</layout>
\ No newline at end of file

Corona-Warn-App/src/main/res/layout/include_submission_consent_body.xml

@@ -16,7 +16,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/submission_consent_your_consent_subsection_headline"
         app:layout_constraintBottom_toBottomOf="@id/submission_consent_your_consent_subsection_third_point"
-        style="@style/cardGrey" />
+        style="@style/GreyCard" />
 
     <TextView
         android:id="@+id/submission_consent_your_consent_subsection_headline"

Corona-Warn-App/src/main/res/layout/include_submission_country_no_selection.xml

@@ -13,7 +13,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/submission_country_no_selection_container"
-        style="@style/cardGrey"
+        style="@style/GreyCard"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:backgroundTint="@{FormatterSubmissionHelper.formatCountrySelectCardColor(active)}"
@@ -36,4 +36,4 @@
         <include layout="@layout/merge_guidelines_side" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</layout>
\ No newline at end of file