diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt index 41eae3deea230ea49f2ceb9fb22cc0eabea518bd..78005f509523630f5a1b8e02a9e47154249187da 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt @@ -134,7 +134,7 @@ class HomeFragment : Fragment(R.layout.home_fragment_layout), AutoInject { } } is HomeFragmentEvents.GoToVaccinationList -> findNavController().navigate( - VaccinationListFragment.navigationUri(event.personIdentifierCode) + VaccinationListFragment.navigationUri(event.personIdentifierCodeSha256) ) } } diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentEvents.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentEvents.kt index a26ead91322308d4b8a9d6be6b3ce9a70ba1388d..52e8e337966a600284fc84ae41a082e069ee3d8f 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentEvents.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentEvents.kt @@ -12,5 +12,5 @@ sealed class HomeFragmentEvents { data class ShowDeleteTestDialog(val type: CoronaTest.Type) : HomeFragmentEvents() - data class GoToVaccinationList(val personIdentifierCode: String) : HomeFragmentEvents() + data class GoToVaccinationList(val personIdentifierCodeSha256: String) : HomeFragmentEvents() } diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentViewModel.kt index e789b1e0fcc46801b5b5ccf118c189298cc431cc..5eebce6b2d80266b23191aadf9bc2d6790a307bd 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentViewModel.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentViewModel.kt @@ -320,7 +320,7 @@ class HomeFragmentViewModel @AssistedInject constructor( vaccinatedPerson = vaccinatedPerson, onClickAction = { popupEvents.postValue( - HomeFragmentEvents.GoToVaccinationList(vaccinatedPerson.identifier.code) + HomeFragmentEvents.GoToVaccinationList(vaccinatedPerson.identifier.codeSHA256) ) } ) @@ -328,7 +328,7 @@ class HomeFragmentViewModel @AssistedInject constructor( vaccinatedPerson = vaccinatedPerson, onClickAction = { popupEvents.postValue( - HomeFragmentEvents.GoToVaccinationList(vaccinatedPerson.identifier.code) + HomeFragmentEvents.GoToVaccinationList(vaccinatedPerson.identifier.codeSHA256) ) } ) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListFragment.kt index 6478749d8b0fcdef5b39f21a7ca462067855d1cd..5e6de31fa480a5465e2da18339975e3cac22e2ec 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListFragment.kt @@ -36,7 +36,7 @@ class VaccinationListFragment : Fragment(R.layout.fragment_vaccination_list), Au constructorCall = { factory, _ -> factory as VaccinationListViewModel.Factory factory.create( - personIdentifierCode = args.personIdentifierCode + personIdentifierCode = args.personIdentifierCodeSha256 ) } ) @@ -124,7 +124,7 @@ class VaccinationListFragment : Fragment(R.layout.fragment_vaccination_list), Au } companion object { - fun navigationUri(personIdentifierCode: String) = - "coronawarnapp://vaccination-list/$personIdentifierCode".toUri() + fun navigationUri(personIdentifierCodeSha256: String) = + "coronawarnapp://vaccination-list/$personIdentifierCodeSha256".toUri() } } diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListViewModel.kt index d621223657f8e081258346911bf2f0589cc61239..0ed0550a991257e869ab11c699eacc6153f71707 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListViewModel.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListViewModel.kt @@ -21,13 +21,13 @@ import kotlinx.coroutines.flow.map class VaccinationListViewModel @AssistedInject constructor( vaccinationRepository: VaccinationRepository, - @Assisted private val personIdentifierCode: String + @Assisted private val personIdentifierCodeSha256: String ) : CWAViewModel() { val events = SingleLiveEvent<Event>() private val vaccinatedPersonFlow = vaccinationRepository.vaccinationInfos.map { vaccinatedPersonSet -> - vaccinatedPersonSet.single { it.identifier.code == personIdentifierCode } + vaccinatedPersonSet.single { it.identifier.codeSHA256 == personIdentifierCodeSha256 } } val uiState: LiveData<UiState> = vaccinatedPersonFlow.map { vaccinatedPerson -> diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/scan/VaccinationQrCodeScanFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/scan/VaccinationQrCodeScanFragment.kt index f762343be41ed3be0ae2cc817730dbe163d0014d..55cc22525a4233756deeaf92d3bcc21b90792387 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/scan/VaccinationQrCodeScanFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/scan/VaccinationQrCodeScanFragment.kt @@ -53,7 +53,7 @@ class VaccinationQrCodeScanFragment : doNavigate( VaccinationQrCodeScanFragmentDirections .actionVaccinationQrCodeScanFragmentToVaccinationListFragment( - event.personIdentifierCode + event.personIdentifierCodeSha256 ) ) } diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/scan/VaccinationQrCodeScanViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/scan/VaccinationQrCodeScanViewModel.kt index 96be326e5dcd9f8928e79b2e825b48f9d4914339..5f8695e78f98984d521d1009476ec8bb96a6bc21 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/scan/VaccinationQrCodeScanViewModel.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/scan/VaccinationQrCodeScanViewModel.kt @@ -26,7 +26,7 @@ class VaccinationQrCodeScanViewModel @AssistedInject constructor( event.postValue(Event.QrCodeScanInProgress) val qrCode = vaccinationQRCodeValidator.validate(barcodeResult.text) val vaccinationCertificate = vaccinationRepository.registerVaccination(qrCode) - event.postValue(Event.QrCodeScanSucceeded(vaccinationCertificate.personIdentifier.code)) + event.postValue(Event.QrCodeScanSucceeded(vaccinationCertificate.personIdentifier.codeSHA256)) } catch (e: Throwable) { errorEvent.postValue(e) } @@ -39,7 +39,7 @@ class VaccinationQrCodeScanViewModel @AssistedInject constructor( sealed class Event { object QrCodeScanInProgress : Event() - data class QrCodeScanSucceeded(val personIdentifierCode: String) : Event() + data class QrCodeScanSucceeded(val personIdentifierCodeSha256: String) : Event() } @AssistedFactory diff --git a/Corona-Warn-App/src/main/res/navigation/vaccination_nav_graph.xml b/Corona-Warn-App/src/main/res/navigation/vaccination_nav_graph.xml index fddaf017adbbe72bd9c289568f9c3aecb0990910..d46c28fca152cfb33db836e9ceb002a131a4be42 100644 --- a/Corona-Warn-App/src/main/res/navigation/vaccination_nav_graph.xml +++ b/Corona-Warn-App/src/main/res/navigation/vaccination_nav_graph.xml @@ -39,13 +39,12 @@ android:label="fragment_vaccination_list" tools:layout="@layout/fragment_vaccination_list"> <argument - android:name="personIdentifierCode" + android:name="personIdentifierCodeSha256" app:argType="string" /> <action android:id="@+id/action_vaccinationListFragment_to_vaccinationDetailsFragment" app:destination="@id/vaccinationDetailsFragment" /> - <deepLink - app:uri="coronawarnapp://vaccination-list/{personIdentifierCode}" /> + <deepLink app:uri="coronawarnapp://vaccination-list/{personIdentifierCodeSha256}" /> <action android:id="@+id/action_vaccinationListFragment_to_vaccinationQrCodeScanFragment" app:destination="@id/vaccinationQrCodeScanFragment" /> @@ -66,4 +65,4 @@ android:name="de.rki.coronawarnapp.ui.information.InformationPrivacyFragment" android:label="privacyFragment" tools:layout="@layout/fragment_information_privacy" /> -</navigation> \ No newline at end of file +</navigation>