Merge pull request #402 from admin-ch/bugfix/eu-national-rules

Check for CH only valid certificates
admin-ch · Apr 7, 2022 · 21325e4 · 21325e4
2 parents d26b93d + 3678322
commit 21325e4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
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
@@ -216,10 +216,10 @@ class CertificateDetailFragment : Fragment() {
 						binding.certificateDetailButtonReverify.showAnimated()
 					}
 
-					val isSuccessState = it.state is VerificationState.SUCCESS
-					val isOnlyNationalRulesInvalid = it.state.isOnlyNationalRulesInvalid()
-					binding.certificateForeignValidityButton.isVisible =
-						currentConfig?.foreignRulesCheckEnabled == true && (isSuccessState || isOnlyNationalRulesInvalid)
+					val isFeatureEnabled = currentConfig?.foreignRulesCheckEnabled == true
+					val isNotInvalid = it.state is VerificationState.SUCCESS || it.state.isOnlyNationalRulesInvalid()
+					val isValidOnlyInSwitzerland = it.state.isValidOnlyInSwitzerland()
+					binding.certificateForeignValidityButton.isVisible = isFeatureEnabled && isNotInvalid && !isValidOnlyInSwitzerland
 
 					updateStatusInfo(it.state)
 				}

diff --git a/wallet/src/main/java/ch/admin/bag/covidcertificate/wallet/util/VerificationStateUtil.kt b/wallet/src/main/java/ch/admin/bag/covidcertificate/wallet/util/VerificationStateUtil.kt
@@ -16,10 +16,7 @@ import androidx.annotation.ColorRes
 import ch.admin.bag.covidcertificate.common.util.addBoldDate
 import ch.admin.bag.covidcertificate.common.util.makeSubStringBold
 import ch.admin.bag.covidcertificate.sdk.core.data.ErrorCodes
-import ch.admin.bag.covidcertificate.sdk.core.models.state.CheckNationalRulesState
-import ch.admin.bag.covidcertificate.sdk.core.models.state.CheckRevocationState
-import ch.admin.bag.covidcertificate.sdk.core.models.state.CheckSignatureState
-import ch.admin.bag.covidcertificate.sdk.core.models.state.VerificationState
+import ch.admin.bag.covidcertificate.sdk.core.models.state.*
 import ch.admin.bag.covidcertificate.wallet.R
 
 const val DATE_REPLACEMENT_STRING = "{DATE}"
@@ -69,6 +66,19 @@ fun VerificationState.getNameDobColor(): Int {
 	}
 }
 
+/**
+ * @return True if this is a successful (wallet) verification state and the certificate is only valid in switzerland
+ */
+fun VerificationState.isValidOnlyInSwitzerland(): Boolean {
+	return when (this) {
+		is VerificationState.SUCCESS -> {
+			val walletSuccessState = this.successState as? SuccessState.WalletSuccessState
+			walletSuccessState?.isValidOnlyInSwitzerland ?: false
+		}
+		else -> false
+	}
+}
+
 /**
  * @return True if this is an invalid verification state and only the national rules check failed (signature and revocation must be valid)
  */