From df44d9b65cfe11910ab23b2b2fe82697f7af99b0 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Tue, 12 May 2015 11:57:07 +0200 Subject: allow linked token without one colon --- .../org/sufficientlysecure/keychain/linked/LinkedTokenResource.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'OpenKeychain/src') 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 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 flags, HashMap params, URI uri) { mFlags = flags; @@ -109,8 +109,7 @@ public abstract class LinkedTokenResource extends LinkedResource { } protected static LinkedTokenResource findResourceType (Set flags, - HashMap params, - URI subUri) { + HashMap params, URI subUri) { LinkedTokenResource res; -- cgit v1.2.3