diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-04-29 21:40:00 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-04-29 21:40:00 +0200 |
commit | 0ef59e36add59add1b34a316dd13a2049165043e (patch) | |
tree | 3d345388e4a5c162407aea5c4f13c112bdbf9854 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/KeyRing.java | |
parent | 0e67b49e1a930f1e59ef6ee3a37d0f31b2e65605 (diff) | |
parent | 6881754062dcd0b83431cfe36398d20e30922096 (diff) | |
download | open-keychain-0ef59e36add59add1b34a316dd13a2049165043e.tar.gz open-keychain-0ef59e36add59add1b34a316dd13a2049165043e.tar.bz2 open-keychain-0ef59e36add59add1b34a316dd13a2049165043e.zip |
Merge pull request #1816 from fiaxh/no_name_choose_email
Correctly handle keys only having an email address
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/KeyRing.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/KeyRing.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/KeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/KeyRing.java index d6132869f..06b18f8e0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/KeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/KeyRing.java @@ -61,6 +61,8 @@ public abstract class KeyRing { private static final Pattern USER_ID_PATTERN = Pattern.compile("^(.*?)(?: \\((.*)\\))?(?: <(.*)>)?$"); + private static final Pattern EMAIL_PATTERN = Pattern.compile("^.*@.*\\..*$"); + /** * Splits userId string into naming part, email part, and comment part * <p/> @@ -71,7 +73,14 @@ public abstract class KeyRing { if (!TextUtils.isEmpty(userId)) { final Matcher matcher = USER_ID_PATTERN.matcher(userId); if (matcher.matches()) { - return new UserId(matcher.group(1), matcher.group(3), matcher.group(2)); + String name = matcher.group(1).isEmpty() ? null : matcher.group(1); + String comment = matcher.group(2); + String email = matcher.group(3); + if (comment == null && email == null && name != null && EMAIL_PATTERN.matcher(name).matches()) { + email = name; + name = null; + } + return new UserId(name, email, comment); } } return new UserId(null, null, null); |