From 7b7d6d9a79e747eba2a0bf9684826ac473362b31 Mon Sep 17 00:00:00 2001 From: Diego Rey Mendez Date: Wed, 1 May 2019 11:25:59 -0300 Subject: [PATCH 1/3] Removes the Jetpack error override. --- .../Signin/LoginSiteAddressViewController.swift | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift b/WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift index 44e6c701b..87d08e017 100644 --- a/WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift +++ b/WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift @@ -168,10 +168,7 @@ class LoginSiteAddressViewController: LoginViewController, NUXKeyboardResponder let err = self.originalErrorOrError(error: error as NSError) - if self.errorDiscoveringJetpackSite(error: err) { - self.displayError(error as NSError, sourceTag: .jetpackLogin) - - } else if let xmlrpcValidatorError = err as? WordPressOrgXMLRPCValidatorError { + if let xmlrpcValidatorError = err as? WordPressOrgXMLRPCValidatorError { self.displayError(message: xmlrpcValidatorError.localizedDescription) } else if (err.domain == NSURLErrorDomain && err.code == NSURLErrorCannotFindHost) || @@ -274,15 +271,6 @@ class LoginSiteAddressViewController: LoginViewController, NUXKeyboardResponder return err } - - @objc func errorDiscoveringJetpackSite(error: NSError) -> Bool { - if let _ = error.userInfo[WordPressOrgXMLRPCValidator.UserInfoHasJetpackKey] { - return true - } - - return false - } - /// Here we will continue with the self-hosted flow. /// @objc func showSelfHostedUsernamePassword() { From aa402f6111d1b381093ead3a3d830e76fb00c995 Mon Sep 17 00:00:00 2001 From: Diego Rey Mendez Date: Wed, 1 May 2019 11:39:57 -0300 Subject: [PATCH 2/3] Updates the podspec version. --- WordPressAuthenticator.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index c17619fa5..a7b012216 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressAuthenticator" - s.version = "1.4.1-beta.2" + s.version = "1.4.1-beta.3" s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps." s.description = <<-DESC From e045e8215f919f1dacfb480ec71bd3549eda6ba2 Mon Sep 17 00:00:00 2001 From: Diego Rey Mendez Date: Thu, 2 May 2019 13:19:26 -0300 Subject: [PATCH 3/3] Updates the WordPressKit pod version. --- Podfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 60132b0a1..45e31bba2 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -44,7 +44,7 @@ PODS: - Specta (1.0.7) - SVProgressHUD (2.2.5) - UIDeviceIdentifier (1.1.4) - - WordPressKit (4.1.0-beta.1): + - WordPressKit (4.1.0-beta.2): - Alamofire (~> 4.7.3) - CocoaLumberjack (~> 3.4) - NSObject-SafeExpectations (= 0.0.3) @@ -117,7 +117,7 @@ SPEC CHECKSUMS: Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66 SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6 UIDeviceIdentifier: 8f8a24b257a4d978c8d40ad1e7355b944ffbfa8c - WordPressKit: ab450fc37b54d8fe6839fb6e4074962980480cc0 + WordPressKit: 9c4aca3f59ee47eb54bb58f5cb710795869ecf05 WordPressShared: ac9ddc5b04d012cf7920867c2a269bce232d4dd8 WordPressUI: 44fe43a9c5c504dfd534286e39e1ce6ebcd69ff5 wpxmlrpc: 6ba55c773cfa27083ae4a2173e69b19f46da98e2