diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-11 17:00:45 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-11 17:00:45 +0200 |
| commit | 92ac2ded10548756922a4c22ebae0a19b8862426 (patch) | |
| tree | 0b0cdbc500b7b86321a1cd6860ef620b156b9168 /OpenKeychain/src | |
| parent | 9aff6c7f8527f3eb78a14c62a677a2fd0631130e (diff) | |
| download | open-keychain-92ac2ded10548756922a4c22ebae0a19b8862426.tar.gz open-keychain-92ac2ded10548756922a4c22ebae0a19b8862426.tar.bz2 open-keychain-92ac2ded10548756922a4c22ebae0a19b8862426.zip | |
linked-ids: small compatibility changes
Diffstat (limited to 'OpenKeychain/src')
3 files changed, 4 insertions, 2 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; } 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" /> </LinearLayout> |