From 74c19c9746357578d78a4bba078da11d35ac6e0a Mon Sep 17 00:00:00 2001 From: sunxiaojian Date: Thu, 25 Feb 2021 16:20:42 +0800 Subject: [PATCH] chore: fill email in MastodonResendEmailViewModelNavigationDelegateShim --- .../ResendEmail/MastodonResendEmailViewController.swift | 7 ------- ...astodonResendEmailViewModelNavigationDelegateShim.swift | 6 +++++- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Mastodon/Scene/Authentication/ResendEmail/MastodonResendEmailViewController.swift b/Mastodon/Scene/Authentication/ResendEmail/MastodonResendEmailViewController.swift index 1a16067c..a10755fe 100644 --- a/Mastodon/Scene/Authentication/ResendEmail/MastodonResendEmailViewController.swift +++ b/Mastodon/Scene/Authentication/ResendEmail/MastodonResendEmailViewController.swift @@ -59,13 +59,6 @@ extension MastodonResendEmailViewController { } } -extension MastodonResendEmailViewController { - func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) { - let scriptString = "document.getElementById('user_email').value = '\(self.viewModel.email)';" - webView.evaluateJavaScript(scriptString) - } -} - extension MastodonResendEmailViewController { @objc private func cancelBarButtonItemPressed(_ sender: UIBarButtonItem) { dismiss(animated: true, completion: nil) diff --git a/Mastodon/Scene/Authentication/ResendEmail/MastodonResendEmailViewModelNavigationDelegateShim.swift b/Mastodon/Scene/Authentication/ResendEmail/MastodonResendEmailViewModelNavigationDelegateShim.swift index ae7047f4..4a27de96 100644 --- a/Mastodon/Scene/Authentication/ResendEmail/MastodonResendEmailViewModelNavigationDelegateShim.swift +++ b/Mastodon/Scene/Authentication/ResendEmail/MastodonResendEmailViewModelNavigationDelegateShim.swift @@ -27,7 +27,11 @@ final class MastodonResendEmailViewModelNavigationDelegateShim: NSObject { extension MastodonResendEmailViewModelNavigationDelegateShim: WKNavigationDelegate { func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) { - + guard let email = self.viewModel?.email else { + return + } + let scriptString = "document.getElementById('user_email').value = '\(email)';" + webView.evaluateJavaScript(scriptString) } }