Reset toggle selection once certificates changes (#5590)

corona-warn-app · Sep 26, 2022 · dac8e06 · dac8e06
1 parent d3bb2cd
commit dac8e06
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/.../java/de/rki/coronawarnapp/covidcertificate/person/ui/overview/PersonOverviewViewModel.kt b/.../java/de/rki/coronawarnapp/covidcertificate/person/ui/overview/PersonOverviewViewModel.kt
@@ -133,7 +133,7 @@ class PersonOverviewViewModel @AssistedInject constructor(
                 ),
                 colorShade = color,
                 badgeCount = person.badgeCount,
-                certificateSelection = selections[person.personIdentifier.groupingKey] ?: CertificateSelection.FIRST,
+                certificateSelection = selections[person.selectionKey] ?: CertificateSelection.FIRST,
                 onClickAction = { _, position ->
                     person.personIdentifier.let { personIdentifier ->
                         events.postValue(
@@ -145,7 +145,7 @@ class PersonOverviewViewModel @AssistedInject constructor(
                 onCertificateSelected = { selection ->
                     selectedCertificates.update { prevSelections ->
                         prevSelections.mutate {
-                            put(person.personIdentifier.groupingKey, selection)
+                            put(person.selectionKey, selection)
                         }.also {
                             savedState[SELECTIONS_KEY] = it
                         }
@@ -154,6 +154,9 @@ class PersonOverviewViewModel @AssistedInject constructor(
             )
         }
 
+    private val PersonCertificates.selectionKey
+        get() = verificationCertificates.map { it.cwaCertificate.qrCodeHash }.sorted().joinToString()
+
     private fun MutableList<PersonCertificatesItem>.addPendingCards(tcWrappers: Set<TestCertificateWrapper>) {
         tcWrappers.filter {
             it.isCertificateRetrievalPending