|
@@ -36,13 +36,16 @@ import org.json.JSONObject;
|
|
|
import java.security.MessageDigest;
|
|
import java.security.MessageDigest;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
+import java.util.regex.Pattern;
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* A login screen that offers login via email/password.
|
|
* A login screen that offers login via email/password.
|
|
|
*/
|
|
*/
|
|
|
public class LoginActivity extends Activity implements LoaderCallbacks<Cursor> {
|
|
public class LoginActivity extends Activity implements LoaderCallbacks<Cursor> {
|
|
|
-
|
|
|
|
|
|
|
+ private static final String EMAIL_PATTERN =
|
|
|
|
|
+ "^[_A-Za-z0-9-\\+]+(\\.[_A-Za-z0-9-]+)*@"
|
|
|
|
|
+ + "[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$";
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* Keep track of the login task to ensure we can cancel it if requested.
|
|
* Keep track of the login task to ensure we can cancel it if requested.
|
|
@@ -144,7 +147,7 @@ public class LoginActivity extends Activity implements LoaderCallbacks<Cursor> {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private boolean isEmailValid(String email) {
|
|
private boolean isEmailValid(String email) {
|
|
|
- return EmailValidator.validate(email);
|
|
|
|
|
|
|
+ return Pattern.compile(EMAIL_PATTERN).matcher(email).matches();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private boolean isPasswordValid(String password) {
|
|
private boolean isPasswordValid(String password) {
|