diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-24 03:49:28 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-24 03:49:28 +0100 |
commit | fe32e7bff4e724d37903d07cd3b4f0287ec85879 (patch) | |
tree | 6ceee3ad9aeef8a5c35802610dacb7115213b82e /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedResource.java | |
parent | b25371fc1bd604dd15f3f42bda7227e3f84d4515 (diff) | |
download | open-keychain-fe32e7bff4e724d37903d07cd3b4f0287ec85879.tar.gz open-keychain-fe32e7bff4e724d37903d07cd3b4f0287ec85879.tar.bz2 open-keychain-fe32e7bff4e724d37903d07cd3b4f0287ec85879.zip |
support github resource (ci)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedResource.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedResource.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedResource.java index f91a24d57..476d0b21e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedResource.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedResource.java @@ -3,6 +3,7 @@ package org.sufficientlysecure.keychain.pgp.linked; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.pgp.linked.resources.DnsResource; import org.sufficientlysecure.keychain.pgp.linked.resources.GenericHttpsResource; +import org.sufficientlysecure.keychain.pgp.linked.resources.GithubResource; import org.sufficientlysecure.keychain.pgp.linked.resources.TwitterResource; import org.sufficientlysecure.keychain.util.Log; @@ -24,7 +25,7 @@ public abstract class LinkedResource { protected final Set<String> mFlags; protected final HashMap<String,String> mParams; - static Pattern magicPattern = + public static Pattern magicPattern = Pattern.compile("\\[Verifying my PGP key: openpgp4fpr:([a-zA-Z0-9]+)]"); protected LinkedResource(Set<String> flags, HashMap<String, String> params, URI uri) { @@ -98,6 +99,10 @@ public abstract class LinkedResource { if (res != null) { return res; } + res = GithubResource.create(flags, params, subUri); + if (res != null) { + return res; + } return null; |