diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-12 11:57:07 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-12 11:57:07 +0200 |
| commit | df44d9b65cfe11910ab23b2b2fe82697f7af99b0 (patch) | |
| tree | 1c1ec99b3c3502955ea24028d74b4ddc73f74fe6 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked | |
| parent | 6fe0a555228bd6fee95cc6f992986f91392ff736 (diff) | |
| download | open-keychain-df44d9b65cfe11910ab23b2b2fe82697f7af99b0.tar.gz open-keychain-df44d9b65cfe11910ab23b2b2fe82697f7af99b0.tar.bz2 open-keychain-df44d9b65cfe11910ab23b2b2fe82697f7af99b0.zip | |
allow linked token without one colon
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedTokenResource.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedTokenResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedTokenResource.java index b5a3a6be6..61e275166 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedTokenResource.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedTokenResource.java @@ -42,7 +42,7 @@ public abstract class LinkedTokenResource extends LinkedResource { protected final HashMap<String,String> mParams; public static Pattern magicPattern = - Pattern.compile("\\[Verifying my (?:Open)?PGP key: openpgp4fpr:([a-zA-Z0-9]+)]"); + Pattern.compile("\\[Verifying my (?:Open|)?PGP key(?::|) openpgp4fpr:([a-zA-Z0-9]+)]"); protected LinkedTokenResource(Set<String> flags, HashMap<String, String> params, URI uri) { mFlags = flags; @@ -109,8 +109,7 @@ public abstract class LinkedTokenResource extends LinkedResource { } protected static LinkedTokenResource findResourceType (Set<String> flags, - HashMap<String,String> params, - URI subUri) { + HashMap<String,String> params, URI subUri) { LinkedTokenResource res; |