Merge pull request #194 from admin-ch/bugfix/date-of-birth-parsing

Date of Birth Parsing
admin-ch · Jul 8, 2021 · a91aea7 · a91aea7
2 parents 5b7ea58 + a190b4d
commit a91aea7
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 10 deletions.
diff --git a/sdk b/sdk
diff --git a/...src/main/java/ch/admin/bag/covidcertificate/verifier/verification/VerificationFragment.kt b/...src/main/java/ch/admin/bag/covidcertificate/verifier/verification/VerificationFragment.kt
@@ -92,7 +92,7 @@ class VerificationFragment : Fragment() {
 
 		binding.verificationFamilyName.text = personName.familyName
 		binding.verificationGivenName.text = personName.givenName
-		binding.verificationBirthdate.text = certificateHolder.getDateOfBirth().format(DEFAULT_DISPLAY_DATE_FORMATTER)
+		binding.verificationBirthdate.text = certificateHolder.getFormattedDateOfBirth()
 		binding.verificationStandardizedNameLabel.text = "${personName.standardizedFamilyName}<<${personName.standardizedGivenName}"
 
 		binding.verificationFooterButton.setOnClickListener {

diff --git a/wallet/src/main/java/ch/admin/bag/covidcertificate/wallet/add/CertificateAddFragment.kt b/wallet/src/main/java/ch/admin/bag/covidcertificate/wallet/add/CertificateAddFragment.kt
@@ -114,8 +114,7 @@ class CertificateAddFragment : Fragment() {
 		val personName = certificateHolder.certificate.getPersonName()
 		val name = "${personName.familyName} ${personName.givenName}"
 		binding.certificateAddName.text = name
-		val dateOfBirth = certificateHolder.certificate.getDateOfBirth().format(DEFAULT_DISPLAY_DATE_FORMATTER)
-		binding.certificateAddBirthdate.text = dateOfBirth
+		binding.certificateAddBirthdate.text = certificateHolder.certificate.getFormattedDateOfBirth()
 
 		val detailItems = CertificateDetailItemListBuilder(recyclerView.context, certificateHolder, showEnglishVersion = false).buildAll()
 		adapter.setItems(detailItems)

diff --git a/...et/src/main/java/ch/admin/bag/covidcertificate/wallet/detail/CertificateDetailFragment.kt b/...et/src/main/java/ch/admin/bag/covidcertificate/wallet/detail/CertificateDetailFragment.kt
@@ -174,8 +174,7 @@ class CertificateDetailFragment : Fragment() {
 		val personName = certificateHolder.certificate.getPersonName()
 		val name = "${personName.familyName} ${personName.givenName}"
 		binding.certificateDetailName.text = name
-		val dateOfBirth = certificateHolder.certificate.getDateOfBirth().format(DEFAULT_DISPLAY_DATE_FORMATTER)
-		binding.certificateDetailBirthdate.text = dateOfBirth
+		binding.certificateDetailBirthdate.text = certificateHolder.certificate.getFormattedDateOfBirth()
 
 		binding.certificateDetailInfo.setText(R.string.verifier_verify_success_info)
 

diff --git a/...in/java/ch/admin/bag/covidcertificate/wallet/homescreen/pager/CertificatePagerFragment.kt b/...in/java/ch/admin/bag/covidcertificate/wallet/homescreen/pager/CertificatePagerFragment.kt
@@ -81,8 +81,7 @@ class CertificatePagerFragment : Fragment() {
 
 		val name = certificateHolder?.certificate?.getPersonName()?.let { "${it.familyName} ${it.givenName}" }
 		binding.certificatePageName.text = name
-		val dateOfBirth = certificateHolder?.certificate?.getDateOfBirth()?.format(DEFAULT_DISPLAY_DATE_FORMATTER)
-		binding.certificatePageBirthdate.text = dateOfBirth
+		binding.certificatePageBirthdate.text = certificateHolder?.certificate?.getFormattedDateOfBirth()
 		binding.certificatePageCard.setCutOutCardBackground()
 		updateTitle()
 		setupStatusInfo()

diff --git a/...src/main/java/ch/admin/bag/covidcertificate/wallet/light/CertificateLightPagerFragment.kt b/...src/main/java/ch/admin/bag/covidcertificate/wallet/light/CertificateLightPagerFragment.kt
@@ -115,8 +115,7 @@ class CertificateLightPagerFragment : Fragment(R.layout.fragment_certificate_lig
 	private fun displayCertificateDetails() {
 		val name = certificateHolder.certificate.getPersonName().let { "${it.familyName} ${it.givenName}" }
 		binding.certificatePageName.text = name
-		val dateOfBirth = certificateHolder.certificate.getDateOfBirth().format(DEFAULT_DISPLAY_DATE_FORMATTER)
-		binding.certificatePageBirthdate.text = dateOfBirth
+		binding.certificatePageBirthdate.text = certificateHolder.certificate.getFormattedDateOfBirth()
 	}
 
 	@SuppressLint("SetTextI18n")
+ −		sdk/libs/CovidCertificate-SDK-Kotlin-1.0.1.jar
+0 −117		sdk/src/main/assets/acceptedCHVaccine.json
+1 −5		sdk/src/main/java/ch/admin/bag/covidcertificate/sdk/android/CovidCertificateSdk.kt
+5 −20		sdk/src/main/java/ch/admin/bag/covidcertificate/sdk/android/data/AcceptedVaccineProvider.kt
+1 −1		sdk/src/main/java/ch/admin/bag/covidcertificate/sdk/android/models/VerifierCertificateHolder.kt