Merge branch 'release/3.2.x' into fix/15011-False-Frame-Color-for-INVALID-and-REVOKED-Certificates-after-RampDown

Author: 30mar

src/xcode/ENA/ENA.xcodeproj/project.pbxproj

@@ -13806,14 +13806,14 @@
 				CODE_SIGNING_REQUIRED = NO;
 				CODE_SIGN_ENTITLEMENTS = "${PROJECT}/Resources/ENA.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 14;
-				DEVELOPMENT_TEAM = 523TP53AQF;
+				DEVELOPMENT_TEAM = "";
 				GCC_PREPROCESSOR_DEFINITIONS = "SQLITE_HAS_CODEC=1";
 				INFOPLIST_FILE = ENA/Resources/Info.plist;
 				IPHONE_APP_CODE_SIGN_IDENTITY = "iPhone Developer";
 				IPHONE_APP_DEV_TEAM = 523TP53AQF;
-				IPHONE_APP_DIST_PROF_SPECIFIER = "523TP53AQF/Corona-Warn-App";
+				IPHONE_APP_DIST_PROF_SPECIFIER = "";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -13827,7 +13827,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = de.rki.coronawarnapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE_SPECIFIER = $IPHONE_APP_DIST_PROF_SPECIFIER;
 				SWIFT_OBJC_BRIDGING_HEADER = "ENA-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;

src/xcode/ENA/ENA/Resources/Localization/bg.lproj/privacy-policy.html

@@ -997,13 +997,6 @@ <h3>
 			To do this, select the procedure “Positive self-test?” or “Positive test and no result in the
 			app?”.
 		</p>
-		<p>
-			Please note that in rare cases, if you use the warning feature, people you know personally who
-			also use the app and then receive a warning, may infer that the warning came from you. This may
-			be the case if a person whom you know had no contact with anyone except with you on the day for
-			which the possible exposure is displayed.
-
-		</p>
 		<h3>
 			f. Using the app for information purposes only
 

src/xcode/ENA/ENA/Resources/Localization/de.lproj/privacy-policy.html

@@ -1027,13 +1027,6 @@ <h3>
 			Wählen Sie hierzu das Verfahren „Selbsttest positiv?“ bzw. „Test positiv und kein Ergebnis in
 			der App?“.
 		</p>
-		<p>
-			Bitte beachten Sie, dass Ihre Warnung in seltenen Fällen dazu führen kann, dass Personen in
-			Ihrem persönlichen Umfeld, die die App nutzen und gewarnt werden, unter Umständen darauf
-			schließen können, dass Sie die Warnung abgegeben haben. Dies kann der Fall sein, wenn eine
-			Person in Ihrem persönlichen Umfeld an dem Tag, an dem die Risiko-Begegnung angezeigt wird,
-			außer mit Ihnen keine anderen Kontakte hatte.
-		</p>
 		<h3>
 			f. Informatorische Nutzung der App
 		</h3>
@@ -1775,18 +1768,13 @@ <h2>
 				die Rechte aus den Artikeln 15, 16, 17, 18, 20 und 21 DSGVO,
 			</li>
 			<li>
-				das Recht, die <a
-					href="https://www.rki.de/DE/Content/Institut/OrgEinheiten/Datenschutz/Datenschutz_node.html">
-				behördliche Datenschutzbeauftragte des RKI</a> zu kontaktieren und Ihr Anliegen vorzubringen
-				(Art. 38 Abs. 4 DSGVO) und
+				das Recht, die <a href="https://www.rki.de/DE/Content/Institut/OrgEinheiten/Datenschutz/Datenschutz_node.html">behördliche Datenschutzbeauftragte des RKI</a> zu kontaktieren und Ihr Anliegen vorzubringen (Art. 38 Abs. 4 DSGVO) und
 			</li>
 			<li>
 				das Recht, sich bei einer Aufsichtsbehörde für den
-				Datenschutz zu beschweren. Dazu können Sie sich an die Aufsichtsbehörde an Ihrem Wohnort
-				oder an die für des RKI
-				zuständige Behörde wenden. Die zuständige Aufsichtsbehörde für das RKI
-				ist der Bundesbeauftragte für den Datenschutz und die
-				Informationsfreiheit, Graurheindorfer Str. 153, 53117 Bonn.
+				Datenschutz zu beschweren. Dazu können Sie sich beispielsweise an die Aufsichtsbehörde an Ihrem Wohnort
+				oder an die für das RKI zuständige Behörde wenden. Die zuständige Aufsichtsbehörde für das RKI
+				ist der Bundesbeauftragte für den Datenschutz und die Informationsfreiheit, Graurheindorfer Str. 153, 53117 Bonn.
 			</li>
 		</ul>
 		<p>
@@ -1803,11 +1791,6 @@ <h2>
 			Ihnen bereitgestellten Informationen zu Ihrer Identität in der Regel nicht
 			erfüllt werden können.
 		</p>
-		<p>
-			Wenn anlässlich der Aktualisierung eines digitalen COVID-Zertifikats der Hash-Wert der
-			elektronischen Signatur vorübergehend gespeichert wird, ermöglicht es dieser dem RKI nicht, die
-			Identität von Zertifikatsinhabern zu ermitteln (siehe Abschnitt 6.o.).
-		</p>
 		<p>
 			Wenn anlässlich der Aktualisierung eines digitalen COVID-Zertifikats die Hash-Werte der
 			elektronischen Signaturen vorübergehend gespeichert werden, ermöglichen es diese dem RKI nicht,

src/xcode/ENA/ENA/Resources/Localization/en.lproj/privacy-policy.html

@@ -997,13 +997,6 @@ <h3>
 			To do this, select the procedure “Positive self-test?” or “Positive test and no result in the
 			app?”.
 		</p>
-		<p>
-			Please note that in rare cases, if you use the warning feature, people you know personally who
-			also use the app and then receive a warning, may infer that the warning came from you. This may
-			be the case if a person whom you know had no contact with anyone except with you on the day for
-			which the possible exposure is displayed.
-
-		</p>
 		<h3>
 			f. Using the app for information purposes only
 
@@ -1750,7 +1743,7 @@ <h2>
 			</li>
 			<li>
 				The right to lodge a complaint with a data protection
-				supervisory authority. To do so, you can either contact your local
+				supervisory authority. To do so, you can for example contact your local
 				supervisory authority or the authority responsible for the RKI. The
 				supervisory authority responsible for the RKI is the Federal
 				Commissioner for Data Protection and Freedom of Information,

src/xcode/ENA/ENA/Resources/Localization/pl.lproj/privacy-policy.html

@@ -997,13 +997,6 @@ <h3>
 			To do this, select the procedure “Positive self-test?” or “Positive test and no result in the
 			app?”.
 		</p>
-		<p>
-			Please note that in rare cases, if you use the warning feature, people you know personally who
-			also use the app and then receive a warning, may infer that the warning came from you. This may
-			be the case if a person whom you know had no contact with anyone except with you on the day for
-			which the possible exposure is displayed.
-
-		</p>
 		<h3>
 			f. Using the app for information purposes only
 

src/xcode/ENA/ENA/Resources/Localization/ro.lproj/privacy-policy.html

@@ -997,13 +997,6 @@ <h3>
 			To do this, select the procedure “Positive self-test?” or “Positive test and no result in the
 			app?”.
 		</p>
-		<p>
-			Please note that in rare cases, if you use the warning feature, people you know personally who
-			also use the app and then receive a warning, may infer that the warning came from you. This may
-			be the case if a person whom you know had no contact with anyone except with you on the day for
-			which the possible exposure is displayed.
-
-		</p>
 		<h3>
 			f. Using the app for information purposes only
 

src/xcode/ENA/ENA/Resources/Localization/tr.lproj/privacy-policy.html

@@ -733,8 +733,7 @@ <h3>
 
 		<p>
 			Uygulamanın ana işlevlerinden biri, risk değerlendirmesidir. Bunun görevleri, Korona testi
-			pozitif çıkan kişilerle olası maruz kalmaları (riskli karşılaşmalar) konusunda sizi sınır ötesi
-			ortamda da uyarmak, kişisel enfeksiyon riskinizi hesaplamak ve size bu bağlamda davranış ve
+			pozitif çıkan kişilerle olası maruz kalmaları (riskli karşılaşmalar) konusunda sizi uyarmak, kişisel enfeksiyon riskinizi hesaplamak ve size bu bağlamda davranış ve
 			sağlık bilgileri temin etmektir.
 		</p>
 
@@ -773,7 +772,7 @@ <h3>
 		</p>
 		<p>
 			Enfeksiyon riski, yalnızca Uygulama içinde hesaplanır ve COVID-19 bildirim sistemine veya diğer
-			alıcılara (RKI, Almanya’daki diğer sağlık kurumları veya diğer ülkeler, Apple, Google ve diğer
+			alıcılara (RKI, sağlık kurumları, Apple, Google ve diğer
 			üçüncü taraflar da dahil olmak üzere) aktarılmaz.
 		</p>
 
@@ -1569,7 +1568,7 @@ <h3>
 		</h3>
 
 		<p>
-			Diğer insanları uyarmak için test sonucunuzun ( (daha doğrusu, son 14 güne dair rastgele kimlik
+			Diğer insanları uyarmak için test sonucunuzun (daha doğrusu, son 14 güne dair rastgele kimlik
 			numaralarınız, olay kimlikleriniz ve kaydedilen giriş ve çıkış denetim zamanlarınızın)
 			aktarılmasına ilişkin vermiş olduğunuz rıza beyanını, testi görüntüleyerek ve ardından
 			“Diğerlerini uyar” seçeneğini devre dışı bırakarak iptal edebilirsiniz. Ayrıca “Giriş
@@ -1676,10 +1675,7 @@ <h2>
 				>
 					RKI’nin veri koruma görevlisi
 				</a>
-				ile iletişim geçme ve isteklerinizi dile getirme hakkı (GVKT madde 38, fıkra 4 uyarınca) ve
-			</li>
-			<li>
-				veri koruma denetim makamına şikayette bulunma hakkı. Bunun için ya ikâmet yerinizdeki
+				ile iletişim geçme ve isteklerinizi dile getirme hakkı (GVKT madde 38, fıkra 4 uyarınca) ve veri koruma denetim makamına şikayette bulunma hakkı. Bunun için ya ikâmet yerinizdeki
 				yetkili denetim makamı ya da RKI için yetkili makam ile iletişime geçebilirsiniz. RKI için
 				yetkili denetim makamı: Bundesbeauftragte für den Datenschutz und die Informationsfreiheit
 				(Federal Veri Koruma ve Bilgi Özgürlüğü Komiseri), Graurheindorfer Str. 153, 53117 Bonn.

src/xcode/ENA/ENA/Source/Models/Exposure/MockExposureManager.swift

@@ -29,6 +29,17 @@ final class MockExposureManager {
 		preconditionFailure("Don't use this mock in production!")
 		#endif
 	}
+	
+	// MARK: - Private
+	
+	private var _exposureManagerState = ExposureManagerState(authorized: true, enabled: true, status: .active) {
+		didSet {
+			guard let appDelegate = UIApplication.shared.delegate as? ENStateHandlerUpdating else {
+				return
+			}
+			appDelegate.updateEnState(_exposureManagerState.status == .active ? .enabled : .disabled)
+		}
+	}
 }
 
 extension MockExposureManager: ExposureManager {
@@ -49,15 +60,17 @@ extension MockExposureManager: ExposureManager {
 	}
 
 	func enable(completion: @escaping CompletionHandler) {
+		_exposureManagerState = ExposureManagerState(authorized: true, enabled: true, status: .active)
 		completion(exposureNotificationError)
 	}
 
 	func disable(completion: @escaping CompletionHandler) {
+		_exposureManagerState = ExposureManagerState(authorized: true, enabled: true, status: .disabled)
 		completion(exposureNotificationError)
 	}
 
 	var exposureManagerState: ExposureManagerState {
-		ExposureManagerState(authorized: true, enabled: true, status: .active)
+		_exposureManagerState
 	}
 
 	func detectExposures(configuration _: ENExposureConfiguration, diagnosisKeyURLs _: [URL], completionHandler: @escaping ENDetectExposuresHandler) -> Progress {

src/xcode/ENA/ENA/Source/Scenes/Events/TraceLocations/Configuration/TraceLocationConfigurationViewController.swift

@@ -60,6 +60,22 @@ class TraceLocationConfigurationViewController: UIViewController, FooterViewHand
 		permanentDefaultLengthFootnoteLabel.text = AppStrings.TraceLocations.Configuration.defaultCheckinLengthFootnote
 
 	}
+	
+	override func viewWillAppear(_ animated: Bool) {
+		// Fix an overlay bug for iPhone SE 1st
+		DispatchQueue.main.async { [weak self] in
+			self?.navigationController?.navigationBar.isTranslucent = false
+			self?.navigationController?.navigationBar.backgroundColor = .enaColor(for: .background)
+		}
+	}
+	
+	override func viewWillDisappear(_ animated: Bool) {
+		// Fix an overlay bug for iPhone SE 1st
+		DispatchQueue.main.async { [weak self] in
+			self?.navigationController?.navigationBar.isTranslucent = true
+			self?.navigationController?.navigationBar.backgroundColor = nil
+		}
+	}
 
 	// MARK: - Protocol FooterViewHandling
 

src/xcode/ENA/ENA/Source/View Helpers/AppStrings.swift

@@ -60,7 +60,7 @@ enum AppStrings {
 		static let coronaWarnAppStoreLink = NSLocalizedString("TicketValidation_CoronaWarnAppLink", tableName: "Localizable.links", comment: "")
 		static let stikoVaccinationRecommendations = NSLocalizedString("Stiko_VaccinationRecommendations", tableName: "Localizable.links", comment: "")
 		static let warnWithoutTANFAQLink = NSLocalizedString("ExposureSubmission_WarnWithoutTAN_FAQLink", tableName: "Localizable.links", comment: "")
-		static let pandemicRadarLink = NSLocalizedString("Home_LinkCard_PandemicRadar_URL", comment: "")
+		static let pandemicRadarLink = NSLocalizedString("Home_LinkCard_PandemicRadar_URL", tableName: "Localizable.links", comment: "")
 	}
 
 	enum QuickActions {