From d20541e8047c98d90d6152a363acc39858705083 Mon Sep 17 00:00:00 2001 From: Giorgos Papadopoulos Date: Tue, 30 Aug 2022 18:26:45 +0300 Subject: [PATCH 1/2] 4795 --- .../rijksoverheid/ctr/holder/your_events/YourEventsFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/holder/src/main/java/nl/rijksoverheid/ctr/holder/your_events/YourEventsFragment.kt b/holder/src/main/java/nl/rijksoverheid/ctr/holder/your_events/YourEventsFragment.kt index b19e5690b..c3cfeb178 100644 --- a/holder/src/main/java/nl/rijksoverheid/ctr/holder/your_events/YourEventsFragment.kt +++ b/holder/src/main/java/nl/rijksoverheid/ctr/holder/your_events/YourEventsFragment.kt @@ -240,7 +240,7 @@ class YourEventsFragment : BaseFragment(R.layout.fragment_your_events) { is YourEventsEndStateWithCustomTitle -> { infoFragmentUtil.presentFullScreen( currentFragment = this, - toolbarTitle = args.toolbarTitle, + toolbarTitle = getString(R.string.certificate_created_toolbar_title), data = InfoFragmentData.TitleDescriptionWithButton( title = getString(endState.title), descriptionData = DescriptionData( From 0c7b1cc49ef5501af1217c550900584061a56dee Mon Sep 17 00:00:00 2001 From: Giorgos Papadopoulos Date: Tue, 30 Aug 2022 18:29:08 +0300 Subject: [PATCH 2/2] fix typo --- .../holder/your_events/models/YourEventsEndState.kt | 4 ++-- .../your_events/utils/YourEventsEndStateUtil.kt | 12 ++++++------ .../ctr/shared/factories/ErrorCodeStringFactory.kt | 4 ++-- .../models/WeCouldnCreateCertificateException.kt | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/holder/src/main/java/nl/rijksoverheid/ctr/holder/your_events/models/YourEventsEndState.kt b/holder/src/main/java/nl/rijksoverheid/ctr/holder/your_events/models/YourEventsEndState.kt index f1437f7b4..a46bd5513 100644 --- a/holder/src/main/java/nl/rijksoverheid/ctr/holder/your_events/models/YourEventsEndState.kt +++ b/holder/src/main/java/nl/rijksoverheid/ctr/holder/your_events/models/YourEventsEndState.kt @@ -9,7 +9,7 @@ package nl.rijksoverheid.ctr.holder.your_events.models import androidx.annotation.StringRes import nl.rijksoverheid.ctr.holder.R -import nl.rijksoverheid.ctr.shared.models.WeCouldnCreateCertificateException +import nl.rijksoverheid.ctr.shared.models.WeCouldntCreateCertificateException sealed class YourEventsEndState { object None : YourEventsEndState() @@ -17,7 +17,7 @@ sealed class YourEventsEndState { // endstate with additional action to complete to visitor assessment object NegativeTestResultAddedAndNowAddVisitorAssessment : YourEventsEndState() // endstate showing an error code - data class WeCouldntMakeACertificateError(val exception: WeCouldnCreateCertificateException) : YourEventsEndState() + data class WeCouldntMakeACertificateError(val exception: WeCouldntCreateCertificateException) : YourEventsEndState() } // additional endstates with custom title and description which cannot be generated by the hints system yet diff --git a/holder/src/main/java/nl/rijksoverheid/ctr/holder/your_events/utils/YourEventsEndStateUtil.kt b/holder/src/main/java/nl/rijksoverheid/ctr/holder/your_events/utils/YourEventsEndStateUtil.kt index 5b696ca5a..527fafc9f 100644 --- a/holder/src/main/java/nl/rijksoverheid/ctr/holder/your_events/utils/YourEventsEndStateUtil.kt +++ b/holder/src/main/java/nl/rijksoverheid/ctr/holder/your_events/utils/YourEventsEndStateUtil.kt @@ -14,7 +14,7 @@ import nl.rijksoverheid.ctr.holder.utils.StringUtil import nl.rijksoverheid.ctr.holder.your_events.models.YourEventsEndState import nl.rijksoverheid.ctr.holder.your_events.models.YourEventsEndStateWithCustomTitle import nl.rijksoverheid.ctr.shared.models.Flow -import nl.rijksoverheid.ctr.shared.models.WeCouldnCreateCertificateException +import nl.rijksoverheid.ctr.shared.models.WeCouldntCreateCertificateException interface YourEventsEndStateUtil { fun getEndState(context: Context, hints: List): YourEventsEndState @@ -61,7 +61,7 @@ class YourEventsEndStateUtilImpl( !hints.contains("negativetest_without_vaccinationassessment") && !hints.contains("vaccinationassessment_missing_supporting_negativetest")) { return YourEventsEndState.WeCouldntMakeACertificateError( - WeCouldnCreateCertificateException("0513") + WeCouldntCreateCertificateException("0513") ) } @@ -86,7 +86,7 @@ class YourEventsEndStateUtilImpl( return YourEventsEndState.None } else if (anyNegativeTestRejected) { return YourEventsEndState.WeCouldntMakeACertificateError( - WeCouldnCreateCertificateException("0512") + WeCouldntCreateCertificateException("0512") ) } @@ -101,7 +101,7 @@ class YourEventsEndStateUtilImpl( YourEventsEndStateWithCustomTitle.RecoveryTooOld } else if (anyRecoveryRejected) { YourEventsEndState.WeCouldntMakeACertificateError( - WeCouldnCreateCertificateException("0511") + WeCouldntCreateCertificateException("0511") ) } else { YourEventsEndState.None @@ -130,7 +130,7 @@ class YourEventsEndStateUtilImpl( if (hints.contains("domestic_vaccination_rejected") && hints.contains("international_vaccination_rejected")) { return YourEventsEndState.WeCouldntMakeACertificateError( - WeCouldnCreateCertificateException("059") + WeCouldntCreateCertificateException("059") ) } @@ -149,7 +149,7 @@ class YourEventsEndStateUtilImpl( ) ) { return YourEventsEndState.WeCouldntMakeACertificateError( - WeCouldnCreateCertificateException("0510") + WeCouldntCreateCertificateException("0510") ) } diff --git a/shared/src/main/java/nl/rijksoverheid/ctr/shared/factories/ErrorCodeStringFactory.kt b/shared/src/main/java/nl/rijksoverheid/ctr/shared/factories/ErrorCodeStringFactory.kt index 5476b3886..d5a513d30 100644 --- a/shared/src/main/java/nl/rijksoverheid/ctr/shared/factories/ErrorCodeStringFactory.kt +++ b/shared/src/main/java/nl/rijksoverheid/ctr/shared/factories/ErrorCodeStringFactory.kt @@ -18,7 +18,7 @@ import nl.rijksoverheid.ctr.shared.models.ErrorResult import nl.rijksoverheid.ctr.shared.models.Flow import nl.rijksoverheid.ctr.shared.models.MissingOriginException import nl.rijksoverheid.ctr.shared.models.NetworkRequestResult -import nl.rijksoverheid.ctr.shared.models.WeCouldnCreateCertificateException +import nl.rijksoverheid.ctr.shared.models.WeCouldntCreateCertificateException import retrofit2.HttpException /** @@ -65,7 +65,7 @@ class ErrorCodeStringFactoryImpl(private val isPlayStoreBuild: Boolean = true) : is NoProvidersException -> exception.errorCode is ActivityNotFoundException -> "070-14" is MissingOriginException -> "058" - is WeCouldnCreateCertificateException -> exception.errorCode + is WeCouldntCreateCertificateException -> exception.errorCode else -> throw it.getException() } diff --git a/shared/src/main/java/nl/rijksoverheid/ctr/shared/models/WeCouldnCreateCertificateException.kt b/shared/src/main/java/nl/rijksoverheid/ctr/shared/models/WeCouldnCreateCertificateException.kt index 074fc5443..25de49923 100644 --- a/shared/src/main/java/nl/rijksoverheid/ctr/shared/models/WeCouldnCreateCertificateException.kt +++ b/shared/src/main/java/nl/rijksoverheid/ctr/shared/models/WeCouldnCreateCertificateException.kt @@ -9,4 +9,4 @@ import java.lang.Exception * SPDX-License-Identifier: EUPL-1.2 * */ -class WeCouldnCreateCertificateException(val errorCode: String) : Exception("We couldn't create certificate exception") +class WeCouldntCreateCertificateException(val errorCode: String) : Exception("We couldn't create certificate exception")