cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow linked token without one colon

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-05-12 11:57:07 +02:00
parent 6fe0a55522
commit df44d9b65c
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedTokenResource.java
View File

@@ -42,7 +42,7 @@ public abstract class LinkedTokenResource extends LinkedResource {
protected final HashMap<String,String> mParams; protected final HashMap<String,String> mParams;
public static Pattern magicPattern = 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) { protected LinkedTokenResource(Set<String> flags, HashMap<String, String> params, URI uri) {
mFlags = flags; mFlags = flags;
@@ -109,8 +109,7 @@ public abstract class LinkedTokenResource extends LinkedResource {
} }
protected static LinkedTokenResource findResourceType (Set<String> flags, protected static LinkedTokenResource findResourceType (Set<String> flags,
HashMap<String,String> params, HashMap<String,String> params, URI subUri) {
URI subUri) {
LinkedTokenResource res; LinkedTokenResource res;