Merge pull request #15 from wordpress-mobile/merge-wpa

Import changes from WPAndroid

Author: aforcier

WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginSiteAddressFragment.java

@@ -10,6 +10,7 @@
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.util.Patterns;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
@@ -146,12 +147,19 @@ protected void discover() {
             return;
         }
 
-        if (TextUtils.isEmpty(mSiteAddressInput.getEditText().getText())) {
+        String cleanedSiteAddress = getCleanedSiteAddress();
+
+        if (TextUtils.isEmpty(cleanedSiteAddress)) {
             showError(R.string.login_empty_site_url);
             return;
         }
 
-        mRequestedSiteAddress = getCleanedSiteAddress();
+        if (!Patterns.WEB_URL.matcher(cleanedSiteAddress).matches()) {
+            showError(R.string.login_invalid_site_url);
+            return;
+        }
+
+        mRequestedSiteAddress = cleanedSiteAddress;
 
         String cleanedXmlrpcSuffix = UrlUtils.removeXmlrpcSuffix(mRequestedSiteAddress);
         mDispatcher.dispatch(SiteActionBuilder.newFetchWpcomSiteByUrlAction(cleanedXmlrpcSuffix));

WordPressLoginFlow/src/main/res/values/strings.xml

@@ -50,6 +50,7 @@
     <string name="login_log_in_for_deeplink">Log in to WordPress.com to access the post.</string>
     <string name="login_log_in_for_share_intent">Log in to WordPress.com to share the content.</string>
     <string name="login_empty_site_url">Please enter a site address</string>
+    <string name="login_invalid_site_url">The site address you entered is invalid. Please re-enter it.</string>
     <string name="login_empty_username">Please enter a username</string>
     <string name="login_empty_password">Please enter a password</string>
     <string name="login_empty_2fa">Please enter a verification code</string>
@@ -89,8 +90,7 @@
     <string name="logging_in">Logging in</string>
     <string name="forgot_password">Lost your password?</string>
     <string name="error_generic">An error occurred</string>
-    <string name="no_site_error">Couldn\'t connect to the WordPress site. There is no valid WordPress site at this
-        address. Check the site address (URL) you entered.</string>
+    <string name="no_site_error">The site at this address is not a WordPress site. For us to connect to it, the site must use WordPress.</string>
     <string name="invalid_site_url_message">Check that the site URL entered is valid</string>
     <string name="xmlrpc_missing_method_error">Couldn\'t connect. Required XML-RPC methods are missing on the server.</string>
     <string name="xmlrpc_post_blocked_error">Couldn\'t connect. Your host is blocking POST requests, and the app needs