diff --git a/univIP/Common/Url.swift b/univIP/Common/Url.swift index ae927f01..557c647f 100644 --- a/univIP/Common/Url.swift +++ b/univIP/Common/Url.swift @@ -98,7 +98,7 @@ enum Url: String, CaseIterable, UrlProtocol { /// TwitterのURL case officialSNS = "https://twitter.com/tokumemo0000" /// ホームページのURL - case homePage = "https://lit.link/developers" + case homePage = "https://tokumemo.notion.site/6e750dcdc6d544a9a23460503d88ca5d" /// トクメモ+のプライバシーポリシーURL[GitHub] case privacyPolicy = "https://tokudai0000.github.io/tokumemo_resource/document/privacy_policy.txt" /// トクメモ+の利用規約URL[GitHub] diff --git a/univIP/Module/Web/WebViewModel.swift b/univIP/Module/Web/WebViewModel.swift index be91a84f..d8ec0cbb 100644 --- a/univIP/Module/Web/WebViewModel.swift +++ b/univIP/Module/Web/WebViewModel.swift @@ -9,6 +9,7 @@ import Foundation import RxRelay import RxSwift import Entity +import AkidonComponents protocol WebViewModelInterface: AnyObject { var input: WebViewModel.Input { get } @@ -110,11 +111,9 @@ final class WebViewModel: BaseViewModel, WebViewModelInterface { input.urlPendingLoad .subscribe { url in - guard let url = url.element, - let host = url.host else { + guard let url = url.element else { return } - urlLabel.accept(host.description) if URLCheckers.isUniversityServiceTimeoutURL(at: url.absoluteString) { reloadLoginURLInWebView.accept(Void()) @@ -125,9 +124,12 @@ final class WebViewModel: BaseViewModel, WebViewModelInterface { input.urlDidLoad .subscribe { url in guard let url = url.element, + let host = url.host, let canExecuteJavascript = state.canExecuteJavascript.value else { return } + urlLabel.accept(host.description) + AKLog(level: .DEBUG, message: "urlDidLoad: \(url)") if URLCheckers.isSkipReminderURL(at: url.absoluteString) { skipReminderJavaScriptInjection.accept(Void())