Merge pull request #5158 from corona-warn-app/fix/15011-False-Frame-Color-for-INVALID-and-REVOKED-Certificates-after-RampDown-20230412

Fix/15011 False Frame Color for INVALID and REVOKED Certificates after RampDown

Author: 30mar

src/xcode/ENA/ENA/Source/AppDelegate & Globals/AppDelegate.swift

@@ -812,7 +812,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, CoronaWarnAppDelegate, Re
 			$0.objectDidChange.send($0)
 		}
 		healthCertificateService.updatePublishersFromStore()
-		healthCertificateService.updateValidityStatesAndNotifications(completion: { })
+		healthCertificateService.updateValidityStatesAndNotifications(completion: { [weak self] in
+			self?.healthCertificateService.updateGradients()
+		})
 		// Clear all notifications including deadman notification
 		UNUserNotificationCenter.current().removeAllPendingNotificationRequests()
 

src/xcode/ENA/ENA/Source/Services/HealthCertificate/HealthCertificateService.swift

@@ -665,6 +665,28 @@ class HealthCertificateService: HealthCertificateServiceServable {
 				$0 == decodingFailedHealthCertificate
 			}
 	}
+	
+	func updateGradients() {
+		let gradientTypes: [GradientView.GradientType] = [.lightBlue, .mediumBlue, .darkBlue]
+		self.healthCertifiedPersons
+			.enumerated()
+			.forEach { index, person in
+				let healthCertificate = person.mostRelevantHealthCertificate
+
+				if healthCertificate?.validityState == .valid ||
+					healthCertificate?.validityState == .expiringSoon ||
+					(healthCertificate?.type == .test && healthCertificate?.validityState == .expired) {
+					person.gradientType = gradientTypes[index % 3]
+				} else {
+					person.gradientType = .solidGrey
+				}
+				
+				// Overwrite the blue or grey with green when mask state is optional
+				if person.isMaskOptional {
+					person.gradientType = .green
+				}
+			}
+	}
 
 	// MARK: - Private
 
@@ -748,28 +770,6 @@ class HealthCertificateService: HealthCertificateServiceServable {
 		}
 	}
 
-	private func updateGradients() {
-		let gradientTypes: [GradientView.GradientType] = [.lightBlue, .mediumBlue, .darkBlue]
-		self.healthCertifiedPersons
-			.enumerated()
-			.forEach { index, person in
-				let healthCertificate = person.mostRelevantHealthCertificate
-
-				if healthCertificate?.validityState == .valid ||
-					healthCertificate?.validityState == .expiringSoon ||
-					(healthCertificate?.type == .test && healthCertificate?.validityState == .expired) {
-					person.gradientType = gradientTypes[index % 3]
-				} else {
-					person.gradientType = .solidGrey
-				}
-				
-				// Overwrite the blue or grey with green when mask state is optional
-				if person.isMaskOptional {
-					person.gradientType = .green
-				}
-			}
-	}
-
 	private func updateDCCWalletInfo(for person: HealthCertifiedPerson, completion: (() -> Void)? = nil) {
 		guard !CWAHibernationProvider.shared.isHibernationState else {
 			completion?()