diff --git a/cfg/VERSION b/cfg/VERSION index d22833606f9..d2208b3f473 100644 --- a/cfg/VERSION +++ b/cfg/VERSION @@ -1 +1 @@ -0.5.0.1682 +0.5.0.1690 diff --git a/src/xcode/ENA/ENA.xcodeproj/project.pbxproj b/src/xcode/ENA/ENA.xcodeproj/project.pbxproj index b9813dbee3b..1d88d369d94 100644 --- a/src/xcode/ENA/ENA.xcodeproj/project.pbxproj +++ b/src/xcode/ENA/ENA.xcodeproj/project.pbxproj @@ -2436,7 +2436,7 @@ CODE_SIGN_ENTITLEMENTS = "${PROJECT}/Resources/ENACommunity.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1682; + CURRENT_PROJECT_VERSION = 1690; DEVELOPMENT_TEAM = $IPHONE_APP_DEV_TEAM; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -2447,7 +2447,7 @@ INFOPLIST_FILE = ENA/Resources/Info.plist; IPHONE_APP_CODE_SIGN_IDENTITY = "iPhone Developer"; IPHONE_APP_DEV_TEAM = ""; - IPHONE_APP_DIST_PROF_SPECIFIER = "523TP53AQF/Corona-Warn-App-Dev"; + IPHONE_APP_DIST_PROF_SPECIFIER = "523TP53AQF/Corona-Warn-App"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2459,7 +2459,7 @@ "-DSQLCIPHER_CRYPTO_CC", "-DNDEBUG", ); - PRODUCT_BUNDLE_IDENTIFIER = "de.rki.coronawarnapp"; + PRODUCT_BUNDLE_IDENTIFIER = de.rki.coronawarnapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_ACTIVE_COMPILATION_CONDITIONS = COMMUNITY; @@ -2597,7 +2597,7 @@ CODE_SIGN_ENTITLEMENTS = "${PROJECT}/Resources/ENACommunity.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1682; + CURRENT_PROJECT_VERSION = 1690; DEVELOPMENT_TEAM = $IPHONE_APP_DEV_TEAM; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -2607,7 +2607,7 @@ INFOPLIST_FILE = ENA/Resources/Info.plist; IPHONE_APP_CODE_SIGN_IDENTITY = "iPhone Developer"; IPHONE_APP_DEV_TEAM = ""; - IPHONE_APP_DIST_PROF_SPECIFIER = "523TP53AQF/Corona-Warn-App-Dev"; + IPHONE_APP_DIST_PROF_SPECIFIER = "523TP53AQF/Corona-Warn-App"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2619,7 +2619,7 @@ "-DSQLCIPHER_CRYPTO_CC", "-DNDEBUG", ); - PRODUCT_BUNDLE_IDENTIFIER = "de.rki.coronawarnapp"; + PRODUCT_BUNDLE_IDENTIFIER = de.rki.coronawarnapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG UITESTING"; @@ -2813,7 +2813,7 @@ CODE_SIGN_ENTITLEMENTS = "${PROJECT}/Resources/ENATest.entitlements"; CODE_SIGN_IDENTITY = $IPHONE_APP_CODE_SIGN_IDENTITY; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1682; + CURRENT_PROJECT_VERSION = 1690; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", @@ -2822,7 +2822,7 @@ 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-Dev"; + IPHONE_APP_DIST_PROF_SPECIFIER = "523TP53AQF/Corona-Warn-App"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2834,7 +2834,7 @@ "-DSQLCIPHER_CRYPTO_CC", "-DNDEBUG", ); - PRODUCT_BUNDLE_IDENTIFIER = "de.rki.coronawarnapp"; + PRODUCT_BUNDLE_IDENTIFIER = de.rki.coronawarnapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = $IPHONE_APP_DIST_PROF_SPECIFIER; SWIFT_OBJC_BRIDGING_HEADER = "ENA-Bridging-Header.h"; @@ -2852,12 +2852,12 @@ CODE_SIGN_ENTITLEMENTS = "${PROJECT}/Resources/ENA.entitlements"; CODE_SIGN_IDENTITY = $IPHONE_APP_CODE_SIGN_IDENTITY; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1682; + CURRENT_PROJECT_VERSION = 1690; 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-Dev"; + IPHONE_APP_DIST_PROF_SPECIFIER = "523TP53AQF/Corona-Warn-App"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2869,7 +2869,7 @@ "-DSQLCIPHER_CRYPTO_CC", "-DNDEBUG", ); - PRODUCT_BUNDLE_IDENTIFIER = "de.rki.coronawarnapp"; + PRODUCT_BUNDLE_IDENTIFIER = de.rki.coronawarnapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = $IPHONE_APP_DIST_PROF_SPECIFIER; SWIFT_OBJC_BRIDGING_HEADER = "ENA-Bridging-Header.h"; @@ -3053,12 +3053,12 @@ CODE_SIGN_ENTITLEMENTS = "${PROJECT}/Resources/ENA.entitlements"; CODE_SIGN_IDENTITY = $IPHONE_APP_CODE_SIGN_IDENTITY; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1682; + CURRENT_PROJECT_VERSION = 1690; 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-Dev"; + IPHONE_APP_DIST_PROF_SPECIFIER = "523TP53AQF/Corona-Warn-App"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/src/xcode/ENA/ENA/Resources/Info.plist b/src/xcode/ENA/ENA/Resources/Info.plist index ae21607cfb2..78048a56d39 100644 --- a/src/xcode/ENA/ENA/Resources/Info.plist +++ b/src/xcode/ENA/ENA/Resources/Info.plist @@ -14,7 +14,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - de.rki.coronawarnapp-dev + de.rki.coronawarnapp CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/src/xcode/ENA/ENA/Source/AppDelegate.swift b/src/xcode/ENA/ENA/Source/AppDelegate.swift index cacff47eb51..54e02ff24c9 100644 --- a/src/xcode/ENA/ENA/Source/AppDelegate.swift +++ b/src/xcode/ENA/ENA/Source/AppDelegate.swift @@ -139,7 +139,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { country: "DE", endpoints: HTTPClient.Configuration.Endpoints( distribution: .init(baseURL: distributionURL, requiresTrailingSlash: false), - submission: .init(baseURL: submissionURL, requiresTrailingSlash: true), + submission: .init(baseURL: submissionURL, requiresTrailingSlash: false), verification: .init(baseURL: verificationURL, requiresTrailingSlash: false) ) ) diff --git a/src/xcode/ENA/ENA/Source/Client/HTTP Client/HTTPClient+Configuration.swift b/src/xcode/ENA/ENA/Source/Client/HTTP Client/HTTPClient+Configuration.swift index 57134c8c2ea..1ef9cc45bbb 100644 --- a/src/xcode/ENA/ENA/Source/Client/HTTP Client/HTTPClient+Configuration.swift +++ b/src/xcode/ENA/ENA/Source/Client/HTTP Client/HTTPClient+Configuration.swift @@ -27,15 +27,15 @@ extension HTTPClient { endpoints: Configuration.Endpoints( distribution: .init( baseURL: URL(staticString: "https://svc90.main.px.t-online.de"), - requiresTrailingSlash: true + requiresTrailingSlash: false ), submission: .init( baseURL: URL(staticString: "https://submission.coronawarn.app"), - requiresTrailingSlash: true + requiresTrailingSlash: false ), verification: .init( baseURL: URL(staticString: "https://verification.coronawarn.app"), - requiresTrailingSlash: true + requiresTrailingSlash: false ) ) ) diff --git a/src/xcode/ENA/ENA/Source/Views/ExposureSubmission/ExposureSubmissionImageCardCell.swift b/src/xcode/ENA/ENA/Source/Views/ExposureSubmission/ExposureSubmissionImageCardCell.swift index d9f57a3a5d4..f3d2e094edc 100644 --- a/src/xcode/ENA/ENA/Source/Views/ExposureSubmission/ExposureSubmissionImageCardCell.swift +++ b/src/xcode/ENA/ENA/Source/Views/ExposureSubmission/ExposureSubmissionImageCardCell.swift @@ -61,6 +61,10 @@ class ExposureSubmissionImageCardCell: UITableViewCell { cardView.addSubview(highlightView) updateIllustration(for: traitCollection) + + isAccessibilityElement = false + cardView.isAccessibilityElement = true + cardView.accessibilityTraits = .button } func configure(title: String, description: String, attributedDescription: NSAttributedString? = nil, image: UIImage?, accessibilityIdentifier: String?) { @@ -72,7 +76,9 @@ class ExposureSubmissionImageCardCell: UITableViewCell { let attributedText = NSMutableAttributedString(attributedString: attributedDescription) descriptionLabel.attributedText = attributedText } - self.accessibilityIdentifier = accessibilityIdentifier + + cardView.accessibilityLabel = "\(title)\n\n\(description)" + cardView.accessibilityIdentifier = accessibilityIdentifier } override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {