aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-05-11 17:00:45 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-05-11 17:00:45 +0200
commit92ac2ded10548756922a4c22ebae0a19b8862426 (patch)
tree0b0cdbc500b7b86321a1cd6860ef620b156b9168 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked
parent9aff6c7f8527f3eb78a14c62a677a2fd0631130e (diff)
downloadopen-keychain-92ac2ded10548756922a4c22ebae0a19b8862426.tar.gz
open-keychain-92ac2ded10548756922a4c22ebae0a19b8862426.tar.bz2
open-keychain-92ac2ded10548756922a4c22ebae0a19b8862426.zip
linked-ids: small compatibility changes
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedTokenResource.java3
1 files changed, 2 insertions, 1 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 3f42355fc..b5a3a6be6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedTokenResource.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedTokenResource.java
@@ -70,7 +70,8 @@ public abstract class LinkedTokenResource extends LinkedResource {
protected static LinkedTokenResource fromUri (URI uri) {
- if (!"openpgpid+token".equals(uri.getScheme())) {
+ if (!"openpgpid+token".equals(uri.getScheme())
+ && !"openpgpid+cookie".equals(uri.getScheme())) {
Log.e(Constants.TAG, "unknown uri scheme in (suspected) linked id packet");
return null;
}