From ba035cddaa2932944bd2bf2dd7b868b88ad6183f Mon Sep 17 00:00:00 2001 From: Joris Mans Date: Wed, 11 Aug 2021 11:05:03 +0200 Subject: [PATCH 1/3] upstep version --- src/xcode/ENA/ENA.xcodeproj/project.pbxproj | 8 ++++---- src/xcode/ENA/ENA/Resources/Info.plist | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/xcode/ENA/ENA.xcodeproj/project.pbxproj b/src/xcode/ENA/ENA.xcodeproj/project.pbxproj index 1b1c60089..26d709052 100644 --- 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 = 127; 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 = 127; 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 = 127; 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 = 127; 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 index 6baa8e256..0409750db 100644 --- a/src/xcode/ENA/ENA/Resources/Info.plist +++ b/src/xcode/ENA/ENA/Resources/Info.plist @@ -26,7 +26,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 126 + $(CURRENT_PROJECT_VERSION) ENAPIVersion 1 ENDeveloperRegion From 2013603f127c9036abd3524ec84574c44826bf92 Mon Sep 17 00:00:00 2001 From: Distiller Date: Wed, 11 Aug 2021 11:11:07 +0000 Subject: [PATCH 2/3] [skip ci] version bump --- src/xcode/ENA/ENA.xcodeproj/project.pbxproj | 8 ++++---- src/xcode/ENA/ENA/Resources/Info.plist | 2 +- src/xcode/ENA/ENATests/Info.plist | 2 +- src/xcode/ENA/ENAUITests/Info.plist | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/xcode/ENA/ENA.xcodeproj/project.pbxproj b/src/xcode/ENA/ENA.xcodeproj/project.pbxproj index 26d709052..1f74fb4c3 100644 --- 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 = 127; + 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 = 127; + 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 = 127; + 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 = 127; + 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 index 0409750db..73e7777a6 100644 --- a/src/xcode/ENA/ENA/Resources/Info.plist +++ b/src/xcode/ENA/ENA/Resources/Info.plist @@ -26,7 +26,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - $(CURRENT_PROJECT_VERSION) + 128 ENAPIVersion 1 ENDeveloperRegion diff --git a/src/xcode/ENA/ENATests/Info.plist b/src/xcode/ENA/ENATests/Info.plist index 51097419e..82037f0aa 100644 --- a/src/xcode/ENA/ENATests/Info.plist +++ b/src/xcode/ENA/ENATests/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 0.5.0 CFBundleVersion - 126 + 128 diff --git a/src/xcode/ENA/ENAUITests/Info.plist b/src/xcode/ENA/ENAUITests/Info.plist index 51097419e..82037f0aa 100644 --- a/src/xcode/ENA/ENAUITests/Info.plist +++ b/src/xcode/ENA/ENAUITests/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 0.5.0 CFBundleVersion - 126 + 128 From 79660b20f3d7e43207b6d83be70f6a5cdfd308cb Mon Sep 17 00:00:00 2001 From: Joris Mans Date: Wed, 10 Nov 2021 10:01:53 +0100 Subject: [PATCH 3/3] fix external links in link pcr form --- .../BEActivateMobileTestIdViewController.swift | 15 +++++++++++++++ src/xcode/fastlane/README.md | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/xcode/ENA/BE/TestActivation/ViewControllers/BEActivateMobileTestIdViewController.swift b/src/xcode/ENA/BE/TestActivation/ViewControllers/BEActivateMobileTestIdViewController.swift index ce7e8ae92..0e872fdff 100644 --- 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/fastlane/README.md b/src/xcode/fastlane/README.md index 6641b2de6..63ec7f255 100644 --- 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).