Merge pull request #4783 from corona-warn-app/fix/13920-False-Screen-…

…Color-when-checking-Mask-Rules-for-Recovery-Certificate-2 fix/13920 false screen color when checking mask rules for recovery certificate
corona-warn-app · Sep 19, 2022 · d7eb80c · d7eb80c
2 parents c3addf4 + c712d73
commit d7eb80c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/xcode/ENA/ENA/Source/AppDelegate & Globals/AppDelegate.swift b/src/xcode/ENA/ENA/Source/AppDelegate & Globals/AppDelegate.swift
@@ -214,6 +214,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, CoronaWarnAppDelegate, Re
 		Analytics.triggerAnalyticsSubmission()
 		appUpdateChecker.checkAppVersionDialog(for: window?.rootViewController)
 		healthCertificateService.updateValidityStatesAndNotifications(completion: { })
+		healthCertificateService.updateDCCWalletInfosIfNeeded()
 	}
 
 	func applicationWillTerminate(_ application: UIApplication) {

diff --git a/src/xcode/ENA/ENA/Source/Services/HealthCertificate/Models/HealthCertifiedPerson.swift b/src/xcode/ENA/ENA/Source/Services/HealthCertificate/Models/HealthCertifiedPerson.swift
@@ -296,9 +296,12 @@ class HealthCertifiedPerson: Codable, Equatable, Comparable {
 	}
 
 	var needsDCCWalletInfoUpdate: Bool {
-		let now = Date()
-
-		return dccWalletInfo == nil || mostRecentWalletInfoUpdateFailed || (dccWalletInfo?.validUntil ?? now) < now
+		guard let validUntil = dccWalletInfo?.validUntil else {
+			// should never happen
+			return true
+		}
+
+		return dccWalletInfo == nil || mostRecentWalletInfoUpdateFailed || validUntil < Date()
 	}
 
 	func healthCertificate(for reference: DCCCertificateReference) -> HealthCertificate? {