From 6afbdac2aee5ba48fea370d7fccf33608f0ff5fe Mon Sep 17 00:00:00 2001 From: jahorton Date: Thu, 19 Sep 2019 09:02:20 +0700 Subject: [PATCH] Adjusts sys kbd setup help link to use help.keyman --- .../InfoViewController/InfoViewController.swift | 2 +- .../SetUpViewController.swift | 16 +++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/ios/keyman/Keyman/Keyman/InfoViewController/InfoViewController.swift b/ios/keyman/Keyman/Keyman/InfoViewController/InfoViewController.swift index 20b45181c9..bb38838a4e 100644 --- a/ios/keyman/Keyman/Keyman/InfoViewController/InfoViewController.swift +++ b/ios/keyman/Keyman/Keyman/InfoViewController/InfoViewController.swift @@ -58,7 +58,7 @@ class InfoViewController: UIViewController, UIWebViewDelegate { private func loadFromServer() { let appVersion = Version.current - let url = "https://help.keyman.com/products/iphone-and-ipad/\(appVersion.string)/?embed=true" + let url = "https://help.keyman.com/products/iphone-and-ipad/\(appVersion.string)/?embed=ios" webView.loadRequest(URLRequest(url: URL(string: url)!)) log.debug("Info page URL: \(url)") } diff --git a/ios/keyman/Keyman/Keyman/SetUpViewController/SetUpViewController.swift b/ios/keyman/Keyman/Keyman/SetUpViewController/SetUpViewController.swift index 13e218bf8d..ab880a94d6 100644 --- a/ios/keyman/Keyman/Keyman/SetUpViewController/SetUpViewController.swift +++ b/ios/keyman/Keyman/Keyman/SetUpViewController/SetUpViewController.swift @@ -62,19 +62,9 @@ class SetUpViewController: UIViewController, UIWebViewDelegate { } private func loadFromServer() { - let keyboardInfo = Manager.shared.currentKeyboard - let currentKeyboardId = keyboardInfo?.id ?? Defaults.keyboard.id - let userData = AppDelegate.activeUserDefaults() - let keyboards = userData.userKeyboards - let keyboardIds = keyboards?.map { $0.id } - let installedKeyboards: String - if let ids = keyboardIds, !ids.isEmpty { - installedKeyboards = Array(Set(ids)).joined(separator: ",") - } else { - installedKeyboards = currentKeyboardId - } - let url = "http://keyman.com/iphone-and-ipad/app/systemkeyboard/index.php" + - "?active=\(currentKeyboardId)&installed=\(installedKeyboards)" + let appVersion = Version.current + let url = "https://help.keyman.com/products/iphone-and-ipad/\(appVersion.string)" + + "/installing-system-keyboard.php?embed=ios" webView.loadRequest(URLRequest(url: URL(string: url)!)) log.debug("Set up page URL: \(url)") }