fix: double scan minor fixes

Co-authored-by: Johnny Bueti <[email protected]> Co-authored-by: eapuzzo <[email protected]>
ministero-salute · Mar 8, 2022 · a1f46b9 · a1f46b9
1 parent 73cf34b
commit a1f46b9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/DGCAVerifier/Pages/Result/VerificationViewController.swift b/DGCAVerifier/Pages/Result/VerificationViewController.swift
@@ -90,7 +90,7 @@ class VerificationViewController: UIViewController {
         if !VerificationState.shared.followUpTestScanned {
             guard status == .verificationIsNeeded else { return }
             addSecondScanButton()
-        } else if VerificationState.shared.isFollowUpScan {
+        } else if VerificationState.shared.isFollowUpScan && status != .notGreenPass {
             addTickView(status)
         }
     }
@@ -151,7 +151,7 @@ class VerificationViewController: UIViewController {
 
     private func validate(_ status: Status) {
         var statusWithValidIdentity: Status = status
-        if VerificationState.shared.followUpTestScanned && !self.viewModel.isPersonalDataCongruent() {
+        if VerificationState.shared.followUpTestScanned && !self.viewModel.isPersonalDataCongruent() && status != .notGreenPass {
             statusWithValidIdentity = .notValid
         }
 

diff --git a/DGCAVerifier/Pages/Result/VerificationViewModel.swift b/DGCAVerifier/Pages/Result/VerificationViewModel.swift
@@ -39,6 +39,9 @@ class VerificationViewModel {
             let scanMode = ScanMode.fetchFromLocalSettings(),
             let hCert = HCert(from: payload) else {
                 self.status = .notGreenPass
+                if VerificationState.shared.shouldValidateTestOnly() {
+                    VerificationState.shared.followUpTestScanned = true
+                }
                 return
         }
 

diff --git a/DGCAVerifier/Utils/ModelExtensions/Status+Configuration.swift b/DGCAVerifier/Utils/ModelExtensions/Status+Configuration.swift
@@ -66,8 +66,12 @@ extension Status {
     var secondScanTitle: String {
         switch self {
         case .valid:                return "result.second.scan.title.valid"
+        case .notValidYet:          return "result.second.scan.title.not.valid"
         case .notValid:             return "result.second.scan.title.not.valid"
-        default: 					return "result.title.not.green.pass"
+        case .expired:              return "result.second.scan.title.not.valid"
+        case .revokedGreenPass:     return "result.second.scan.title.not.valid"
+        case .verificationIsNeeded: return "result.second.scan.title.not.valid"
+        case .notGreenPass:         return "result.title.not.green.pass"
         }
     }
 

diff --git a/Verifier.xcodeproj/project.pbxproj b/Verifier.xcodeproj/project.pbxproj
@@ -2144,7 +2144,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.8;
+				MARKETING_VERSION = 1.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = it.ministerodellasalute.VerificaC19;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2168,7 +2168,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.8;
+				MARKETING_VERSION = 1.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = it.ministerodellasalute.VerificaC19;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2255,7 +2255,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.8;
+				MARKETING_VERSION = 1.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = it.ministerodellasalute.VerificaC19;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2280,7 +2280,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.8;
+				MARKETING_VERSION = 1.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = it.ministerodellasalute.VerificaC19;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2411,7 +2411,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.8;
+				MARKETING_VERSION = 1.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = it.ministerodellasalute.VerificaC19;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2436,7 +2436,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.8;
+				MARKETING_VERSION = 1.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = it.ministerodellasalute.VerificaC19;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2630,7 +2630,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.8;
+				MARKETING_VERSION = 1.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = it.ministerodellasalute.VerificaC19;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2655,7 +2655,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.8;
+				MARKETING_VERSION = 1.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = it.ministerodellasalute.VerificaC19;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";