COVIDSafe code from version 1.9 (#18)

This commit is contained in:
COVIDSafe Support 2020-08-03 16:01:39 +10:00 committed by GitHub
parent 2257c542ed
commit 3b1d8fa3f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
41 changed files with 4217 additions and 3998 deletions

View file

@ -6,7 +6,7 @@ import UIKit
class HelpNavController: UINavigationController {
private static let HELP_PAGE_URL = URLHelper.getHelpURL()
var pageSectionId:String?
private let loader = UIActivityIndicatorView(style: .gray)
let webview = WKWebView()
@ -87,7 +87,8 @@ class HelpNavController: UINavigationController {
}
private func loadHelp() {
guard let url = URL(string: HelpNavController.HELP_PAGE_URL) else {
let pageId = pageSectionId != nil ? "#\(pageSectionId!)" : ""
guard let url = URL(string: "\(HelpNavController.HELP_PAGE_URL)\(pageId)") else {
assertionFailure("Invalid URL: \(HelpNavController.HELP_PAGE_URL)")
return
}
@ -138,7 +139,7 @@ extension HelpNavController: WKNavigationDelegate {
func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
guard let url = navigationAction.request.url,
url.absoluteString != HelpNavController.HELP_PAGE_URL else {
!url.absoluteString.contains(HelpNavController.HELP_PAGE_URL) else {
decisionHandler(.allow)
return
}