Merge pull request #34 from cem-/master

Issue 17 - email pattern
This commit is contained in:
Moxie Marlinspike 2012-07-16 18:30:53 -07:00
commit 306a360f14

View File

@ -1,5 +1,5 @@
/** /**
* Copyright (C) 2011 Whisper Systems * Copyright (C) 2012 Whisper Systems
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -23,8 +23,7 @@ import android.telephony.PhoneNumberUtils;
public class NumberUtil { public class NumberUtil {
private static final String emailExpression = "^[\\w\\-]([\\.\\w])+[\\w]+@([\\w\\-]+\\.)+[A-Z]{2,4}$"; private static final Pattern emailPattern = android.util.Patterns.EMAIL_ADDRESS;
private static final Pattern emailPattern = Pattern.compile(emailExpression, Pattern.CASE_INSENSITIVE);
public static boolean isValidEmail(String number) { public static boolean isValidEmail(String number) {
Matcher matcher = emailPattern.matcher(number); Matcher matcher = emailPattern.matcher(number);