erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-13 04:09:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

fix(ios): fixes sys-kbd setup help link for iOS 9 and 10

Browse source
This commit is contained in:
jahorton 2021-03-24 14:02:42 +07:00
parent 785cf0448d
commit 93ff4e0886
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ios/keyman/Keyman/Keyman/SetUpViewController/SetUpViewController.swift
View file

@ -44,12 +44,15 @@ class SetUpViewController: UIViewController, UIWebViewDelegate {
}
func reloadKeymanHelp() {
let networkStatus = networkReachable?.connection
switch networkStatus {
case Reachability.Connection.none?:
if let networkStatus = networkReachable?.connection {
switch networkStatus {
case Reachability.Connection.none, Reachability.Connection.unavailable:
loadFromLocal()
default:
loadFromServer()
}
} else {
loadFromLocal()
default:
loadFromServer()
}
}
@ -62,16 +65,16 @@ class SetUpViewController: UIViewController, UIWebViewDelegate {
// Yes, .php.html. That's how `wget` is set to retrieve it, since Safari won't recognize the contents
// without the .html ending, it seems.
let filePath = offlineHelpBundle.path(forResource: "installing-system-keyboard.php",
let filePath = offlineHelpBundle.path(forResource: "installing-system-keyboard",
ofType: "html",
inDirectory: nil)
inDirectory: "start")
webView.loadRequest(URLRequest(url: URL.init(fileURLWithPath: filePath!)))
}
private func loadFromServer() {
let appVersion = Version.current.majorMinor
let url = "https://help.keyman.com/products/iphone-and-ipad/\(appVersion.plainString)"
+ "/installing-system-keyboard.php?embed=ios"
+ "/start/installing-system-keyboard"
webView.loadRequest(URLRequest(url: URL(string: url)!))
log.debug("Set up page URL: \(url)")
}