Merge branch 'develop' into try/fix-bug-login-in-with-site-adress

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

WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift

@@ -172,10 +172,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) ||
@@ -278,15 +275,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() {