loveisgrief/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SusiMail: Use pattern matcher

Browse Source
This commit is contained in:
zzz
2017-12-22 13:52:59 +00:00
parent 7379645869
commit 4ee6ae96a2
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/susimail/src/src/i2p/susi/webmail/Mail.java
View File

@@ -40,6 +40,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
import java.util.regex.Pattern;
import net.i2p.data.DataHelper;
import net.i2p.util.SystemVersion;
@@ -52,8 +53,11 @@ import net.i2p.util.SystemVersion;
class Mail {
private static final String DATEFORMAT = "date.format";
private static final String unknown = "unknown";
private static final String P1 = "^[^@< \t]+@[^> \t]+$";
private static final String P2 = "^<[^@< \t]+@[^> \t]+>$";
private static final Pattern PATTERN1 = Pattern.compile(P1);
private static final Pattern PATTERN2 = Pattern.compile(P2);
private int size;
public String sender, // as received, trimmed only, not HTML escaped
@@ -216,9 +220,9 @@ class Mail {
String[] tokens = DataHelper.split(address, "[ \t]+");
for( int i = 0; i < tokens.length; i++ ) {
if( tokens[i].matches( "^[^@< \t]+@[^> \t]+$" ) )
if (PATTERN1.matcher(tokens[i]).matches())
return "<" + tokens[i] + ">";
if( tokens[i].matches( "^<[^@< \t]+@[^> \t]+>$" ) )
if (PATTERN2.matcher(tokens[i]).matches())
return tokens[i];
}