From 92ac2ded10548756922a4c22ebae0a19b8862426 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Mon, 11 May 2015 17:00:45 +0200 Subject: linked-ids: small compatibility changes --- .../org/sufficientlysecure/keychain/linked/LinkedTokenResource.java | 3 ++- .../sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java | 2 +- OpenKeychain/src/main/res/layout/view_key_fragment.xml | 1 + 3 files changed, 4 insertions(+), 2 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 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; } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java index 00eeb5de6..7e9aaf25e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java @@ -457,7 +457,7 @@ public class LinkedIdViewFragment extends CryptoOperationFragment implements @Override protected LinkedVerifyResult doInBackground(Void... params) { long timer = System.currentTimeMillis(); - LinkedVerifyResult result = mLinkedResource.verify(mFingerprint); + LinkedVerifyResult result = mLinkedResource.verify(getActivity(), mFingerprint); // ux flow: this operation should take at last a second timer = System.currentTimeMillis() -timer; diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml index 9fb528051..294ac59a7 100644 --- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml @@ -91,6 +91,7 @@ android:paddingRight="8dp" android:background="?android:selectableItemBackground" android:visibility="gone" + tools:visibility="visible" /> -- cgit v1.2.3