Merge pull request #432 from covid-be-app/fix/pcr_form

Fix link code to pcr form
covid-be-app · Nov 12, 2021 · 3d63302 · 3d63302
2 parents 12cecc7 + 79660b2
commit 3d63302
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 8 deletions.
diff --git a/src/xcode/ENA/BE/TestActivation/ViewControllers/BEActivateMobileTestIdViewController.swift b/src/xcode/ENA/BE/TestActivation/ViewControllers/BEActivateMobileTestIdViewController.swift
@@ -151,12 +151,27 @@ extension BEActivateMobileTestIdViewController: WKNavigationDelegate {
 
 		if let url = navigationAction.request.url {
 			let urlString = url.absoluteString
+
+			if urlString.contains("#") {
+				decisionHandler(.allow)
+				return
+			}
 
 			/// successful submission
 			if Self.successRedirectPaths.first(where:{ urlString.contains($0)}) != nil {
 				decisionHandler(.cancel)
 				delegate?.activateMobileTestIdViewControllerFinished(self)
 				return
+			} else {
+
+				if navigationAction.navigationType == .other {
+					decisionHandler(.allow)
+					return
+				}
+
+				UIApplication.shared.open(url, options: [:])
+				decisionHandler(.cancel)
+				return
 			}
 		}
 

diff --git a/src/xcode/ENA/ENA.xcodeproj/project.pbxproj b/src/xcode/ENA/ENA.xcodeproj/project.pbxproj
@@ -3722,7 +3722,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "${PROJECT}/Resources/ENACommunity.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 126;
+				CURRENT_PROJECT_VERSION = 128;
 				DEVELOPMENT_TEAM = UK48F668XR;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -3882,7 +3882,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "${PROJECT}/Resources/ENACommunity.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 126;
+				CURRENT_PROJECT_VERSION = 128;
 				DEVELOPMENT_TEAM = UK48F668XR;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -4098,7 +4098,7 @@
 				CODE_SIGN_ENTITLEMENTS = "${PROJECT}/Resources/ENATest.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 126;
+				CURRENT_PROJECT_VERSION = 128;
 				DEVELOPMENT_TEAM = UK48F668XR;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -4138,7 +4138,7 @@
 				CODE_SIGN_ENTITLEMENTS = "${PROJECT}/Resources/ENA.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 126;
+				CURRENT_PROJECT_VERSION = 128;
 				DEVELOPMENT_TEAM = UK48F668XR;
 				GCC_OPTIMIZATION_LEVEL = s;
 				GCC_PREPROCESSOR_DEFINITIONS = "SQLITE_HAS_CODEC=1";

diff --git a/src/xcode/ENA/ENA/Resources/Info.plist b/src/xcode/ENA/ENA/Resources/Info.plist
@@ -26,7 +26,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>126</string>
+	<string>128</string>
 	<key>ENAPIVersion</key>
 	<string>1</string>
 	<key>ENDeveloperRegion</key>

diff --git a/src/xcode/ENA/ENATests/Info.plist b/src/xcode/ENA/ENATests/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.5.0</string>
 	<key>CFBundleVersion</key>
-	<string>126</string>
+	<string>128</string>
 </dict>
 </plist>
diff --git a/src/xcode/ENA/ENAUITests/Info.plist b/src/xcode/ENA/ENAUITests/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.5.0</string>
 	<key>CFBundleVersion</key>
-	<string>126</string>
+	<string>128</string>
 </dict>
 </plist>
diff --git a/src/xcode/fastlane/README.md b/src/xcode/fastlane/README.md
@@ -59,6 +59,6 @@ Build and upload for App Store
 
 ----
 
-This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run.
+This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
 More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
 The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).