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

linked-ids: small compatibility changes

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-05-11 17:00:45 +02:00
parent 9aff6c7f85
commit 92ac2ded10
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,7 +70,8 @@ public abstract class LinkedTokenResource extends LinkedResource {
protected static LinkedTokenResource fromUri (URI uri) { 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"); Log.e(Constants.TAG, "unknown uri scheme in (suspected) linked id packet");
return null; return null;
} }

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java
View File

@@ -457,7 +457,7 @@ public class LinkedIdViewFragment extends CryptoOperationFragment implements
@Override @Override
protected LinkedVerifyResult doInBackground(Void... params) { protected LinkedVerifyResult doInBackground(Void... params) {
long timer = System.currentTimeMillis(); 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 // ux flow: this operation should take at last a second
timer = System.currentTimeMillis() -timer; timer = System.currentTimeMillis() -timer;

1
OpenKeychain/src/main/res/layout/view_key_fragment.xml
View File

@@ -91,6 +91,7 @@
android:paddingRight="8dp" android:paddingRight="8dp"
android:background="?android:selectableItemBackground" android:background="?android:selectableItemBackground"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"
/> />
</LinearLayout> </LinearLayout>