Fingerprint verification, design fixes for qr code card

4 files changed, 309 insertions, 42 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java
new file mode 100644
index 000000000..777288e69
--- /dev/null
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2015 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.sufficientlysecure.keychain.ui;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.View;
+
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.operations.results.OperationResult;
+import org.sufficientlysecure.keychain.util.Log;
+
+public class CertifyFingerprintActivity extends BaseActivity {
+
+    protected Uri mDataUri;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mDataUri = getIntent().getData();
+        if (mDataUri == null) {
+            Log.e(Constants.TAG, "Data missing. Should be uri of key!");
+            finish();
+            return;
+        }
+
+        setFullScreenDialogClose(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+        Log.i(Constants.TAG, "mDataUri: " + mDataUri.toString());
+
+        startFragment(savedInstanceState, mDataUri);
+    }
+
+    @Override
+    protected void initLayout() {
+        setContentView(R.layout.certify_fingerprint_activity);
+    }
+
+    private void startFragment(Bundle savedInstanceState, Uri dataUri) {
+        // However, if we're being restored from a previous state,
+        // then we don't need to do anything and should return or else
+        // we could end up with overlapping fragments.
+        if (savedInstanceState != null) {
+            return;
+        }
+
+        // Create an instance of the fragment
+        CertifyFingerprintFragment frag = CertifyFingerprintFragment.newInstance(dataUri);
+
+        // Add the fragment to the 'fragment_container' FrameLayout
+        // NOTE: We use commitAllowingStateLoss() to prevent weird crashes!
+        getSupportFragmentManager().beginTransaction()
+                .replace(R.id.certify_fingerprint_fragment, frag)
+                .commitAllowingStateLoss();
+        // do it immediately!
+        getSupportFragmentManager().executePendingTransactions();
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        // if a result has been returned, display a notify
+        if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) {
+            OperationResult result = data.getParcelableExtra(OperationResult.EXTRA_RESULT);
+            result.createNotify(this).show();
+        } else {
+            super.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintFragment.java
new file mode 100644
index 000000000..aef705ee9
--- /dev/null
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintFragment.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright (C) 2015 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.sufficientlysecure.keychain.ui;
+
+import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v4.app.LoaderManager;
+import android.support.v4.content.CursorLoader;
+import android.support.v4.content.Loader;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
+import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
+import org.sufficientlysecure.keychain.util.Log;
+
+
+public class CertifyFingerprintFragment extends LoaderFragment implements
+        LoaderManager.LoaderCallbacks<Cursor> {
+
+    public static final String ARG_DATA_URI = "uri";
+
+    private TextView mFingerprint;
+
+    private static final int LOADER_ID_UNIFIED = 0;
+
+    private Uri mDataUri;
+
+    private View mActionNo;
+    private View mActionYes;
+
+    /**
+     * Creates new instance of this fragment
+     */
+    public static CertifyFingerprintFragment newInstance(Uri dataUri) {
+        CertifyFingerprintFragment frag = new CertifyFingerprintFragment();
+        Bundle args = new Bundle();
+        args.putParcelable(ARG_DATA_URI, dataUri);
+
+        frag.setArguments(args);
+
+        return frag;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup superContainer, Bundle savedInstanceState) {
+        View root = super.onCreateView(inflater, superContainer, savedInstanceState);
+        View view = inflater.inflate(R.layout.certify_fingerprint_fragment, getContainer());
+
+        mActionNo = view.findViewById(R.id.certify_fingerprint_button_no);
+        mActionYes = view.findViewById(R.id.certify_fingerprint_button_yes);
+
+        mFingerprint = (TextView) view.findViewById(R.id.certify_fingerprint_fingerprint);
+
+        mActionNo.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getActivity().finish();
+            }
+        });
+        mActionYes.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                certify(mDataUri);
+            }
+        });
+
+        return root;
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        Uri dataUri = getArguments().getParcelable(ARG_DATA_URI);
+        if (dataUri == null) {
+            Log.e(Constants.TAG, "Data missing. Should be Uri of key!");
+            getActivity().finish();
+            return;
+        }
+
+        loadData(dataUri);
+    }
+
+    private void loadData(Uri dataUri) {
+        mDataUri = dataUri;
+
+        Log.i(Constants.TAG, "mDataUri: " + mDataUri.toString());
+
+        // Prepare the loaders. Either re-connect with an existing ones,
+        // or start new ones.
+        getLoaderManager().initLoader(LOADER_ID_UNIFIED, null, this);
+    }
+
+    static final String[] UNIFIED_PROJECTION = new String[]{
+            KeyRings._ID, KeyRings.FINGERPRINT,
+
+    };
+    static final int INDEX_UNIFIED_FINGERPRINT = 1;
+
+    public Loader<Cursor> onCreateLoader(int id, Bundle args) {
+        setContentShown(false);
+        switch (id) {
+            case LOADER_ID_UNIFIED: {
+                Uri baseUri = KeyRings.buildUnifiedKeyRingUri(mDataUri);
+                return new CursorLoader(getActivity(), baseUri, UNIFIED_PROJECTION, null, null, null);
+            }
+
+            default:
+                return null;
+        }
+    }
+
+    public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
+        /* TODO better error handling? May cause problems when a key is deleted,
+         * because the notification triggers faster than the activity closes.
+         */
+        // Avoid NullPointerExceptions...
+        if (data.getCount() == 0) {
+            return;
+        }
+        // Swap the new cursor in. (The framework will take care of closing the
+        // old cursor once we return.)
+        switch (loader.getId()) {
+            case LOADER_ID_UNIFIED: {
+                if (data.moveToFirst()) {
+
+                    byte[] fingerprintBlob = data.getBlob(INDEX_UNIFIED_FINGERPRINT);
+                    String fingerprint = KeyFormattingUtils.convertFingerprintToHex(fingerprintBlob);
+                    mFingerprint.setText(KeyFormattingUtils.colorizeFingerprint(fingerprint));
+
+                    break;
+                }
+            }
+
+        }
+        setContentShown(true);
+    }
+
+    /**
+     * This is called when the last Cursor provided to onLoadFinished() above is about to be closed.
+     * We need to make sure we are no longer using it.
+     */
+    public void onLoaderReset(Loader<Cursor> loader) {
+    }
+
+    private void certify(Uri dataUri) {
+        long keyId = 0;
+        try {
+            keyId = new ProviderHelper(getActivity())
+                    .getCachedPublicKeyRing(dataUri)
+                    .extractOrGetMasterKeyId();
+        } catch (PgpKeyNotFoundException e) {
+            Log.e(Constants.TAG, "key not found!", e);
+        }
+        Intent certifyIntent = new Intent(getActivity(), CertifyKeyActivity.class);
+        certifyIntent.putExtra(CertifyKeyActivity.EXTRA_KEY_IDS, new long[]{keyId});
+        startActivityForResult(certifyIntent, 0);
+    }
+
+}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeViewActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeViewActivity.java
index b24ee84a4..d3c1d971a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeViewActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeViewActivity.java
@@ -21,6 +21,7 @@ import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.ActivityCompat;
+import android.support.v7.widget.CardView;
 import android.view.View;
 import android.view.ViewTreeObserver.OnGlobalLayoutListener;
 import android.widget.ImageView;
@@ -37,7 +38,8 @@ import org.sufficientlysecure.keychain.util.Log;
 
 public class QrCodeViewActivity extends BaseActivity {
 
-    private ImageView mFingerprintQrCode;
+    private ImageView mQrCode;
+    private CardView mQrCodeLayout;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -61,9 +63,10 @@ public class QrCodeViewActivity extends BaseActivity {
             return;
         }
 
-        mFingerprintQrCode = (ImageView) findViewById(R.id.qr_code_image);
+        mQrCode = (ImageView) findViewById(R.id.qr_code_image);
+        mQrCodeLayout = (CardView) findViewById(R.id.qr_code_image_layout);
 
-        mFingerprintQrCode.setOnClickListener(new View.OnClickListener() {
+        mQrCodeLayout.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 ActivityCompat.finishAfterTransition(QrCodeViewActivity.this);
@@ -87,14 +90,14 @@ public class QrCodeViewActivity extends BaseActivity {
             // create a minimal size qr code, we can keep this in ram no problem
             final Bitmap qrCode = QrCodeUtils.getQRCodeBitmap(qrCodeContent, 0);
 
-            mFingerprintQrCode.getViewTreeObserver().addOnGlobalLayoutListener(
+            mQrCode.getViewTreeObserver().addOnGlobalLayoutListener(
                     new OnGlobalLayoutListener() {
                         @Override
                         public void onGlobalLayout() {
                             // create actual bitmap in display dimensions
                             Bitmap scaled = Bitmap.createScaledBitmap(qrCode,
-                                    mFingerprintQrCode.getWidth(), mFingerprintQrCode.getWidth(), false);
-                            mFingerprintQrCode.setImageBitmap(scaled);
+                                    mQrCode.getWidth(), mQrCode.getWidth(), false);
+                            mQrCode.setImageBitmap(scaled);
                         }
                     });
         } catch (ProviderHelper.NotFoundException e) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index c67fde8e1..e1a8981c4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -87,11 +87,10 @@ public class ViewKeyActivity extends BaseActivity implements
 
     private ImageButton mActionEncryptFile;
     private ImageButton mActionEncryptText;
-    private ImageButton mActionVerify;
     private ImageButton mActionNfc;
     private FloatingActionButton mFab;
     private AspectRatioImageView mPhoto;
-    private ImageButton mQrCode;
+    private ImageView mQrCode;
     private CardView mQrCodeLayout;
 
     // NFC
@@ -105,6 +104,7 @@ public class ViewKeyActivity extends BaseActivity implements
 
     private boolean mIsSecret = false;
     private boolean mHasEncrypt = false;
+    private boolean mIsVerified = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -122,11 +122,10 @@ public class ViewKeyActivity extends BaseActivity implements
 
         mActionEncryptFile = (ImageButton) findViewById(R.id.view_key_action_encrypt_files);
         mActionEncryptText = (ImageButton) findViewById(R.id.view_key_action_encrypt_text);
-        mActionVerify = (ImageButton) findViewById(R.id.view_key_action_verify);
         mActionNfc = (ImageButton) findViewById(R.id.view_key_action_nfc);
         mFab = (FloatingActionButton) findViewById(R.id.fab);
         mPhoto = (AspectRatioImageView) findViewById(R.id.view_key_photo);
-        mQrCode = (ImageButton) findViewById(R.id.view_key_qr_code);
+        mQrCode = (ImageView) findViewById(R.id.view_key_qr_code);
         mQrCodeLayout = (CardView) findViewById(R.id.view_key_qr_code_layout);
 
         mDataUri = getIntent().getData();
@@ -159,11 +158,6 @@ public class ViewKeyActivity extends BaseActivity implements
                 encrypt(mDataUri, true);
             }
         });
-        mActionVerify.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View view) {
-                certify(mDataUri);
-            }
-        });
 
         mFab.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -176,7 +170,7 @@ public class ViewKeyActivity extends BaseActivity implements
             }
         });
 
-        mQrCode.setOnClickListener(new View.OnClickListener() {
+        mQrCodeLayout.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 showQrCodeDialog();
@@ -269,6 +263,10 @@ public class ViewKeyActivity extends BaseActivity implements
                     editKey(mDataUri);
                     return true;
                 }
+                case R.id.menu_key_view_certify_fingerprint: {
+                    certifyFingeprint(mDataUri);
+                    return true;
+                }
             }
         } catch (ProviderHelper.NotFoundException e) {
             Notify.showNotify(this, R.string.error_key_not_found, Notify.Style.ERROR);
@@ -279,8 +277,11 @@ public class ViewKeyActivity extends BaseActivity implements
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-        MenuItem register = menu.findItem(R.id.menu_key_view_edit);
-        register.setVisible(mIsSecret);
+        MenuItem editKey = menu.findItem(R.id.menu_key_view_edit);
+        editKey.setVisible(mIsSecret);
+        MenuItem certifyFingerprint = menu.findItem(R.id.menu_key_view_certify_fingerprint);
+        certifyFingerprint.setVisible(!mIsSecret && !mIsVerified);
+
         return true;
     }
 
@@ -321,6 +322,12 @@ public class ViewKeyActivity extends BaseActivity implements
         startActivityForResult(scanQrCode, 0);
     }
 
+    private void certifyFingeprint(Uri dataUri) {
+        Intent intent = new Intent(this, CertifyFingerprintActivity.class);
+        intent.setData(dataUri);
+        startActivityForResult(intent, 0);
+    }
+
     private void showQrCodeDialog() {
         Intent qrCodeIntent = new Intent(this, QrCodeViewActivity.class);
 
@@ -420,20 +427,6 @@ public class ViewKeyActivity extends BaseActivity implements
         startActivityForResult(queryIntent, 0);
     }
 
-    private void certify(Uri dataUri) {
-        long keyId = 0;
-        try {
-            keyId = new ProviderHelper(this)
-                    .getCachedPublicKeyRing(dataUri)
-                    .extractOrGetMasterKeyId();
-        } catch (PgpKeyNotFoundException e) {
-            Log.e(Constants.TAG, "key not found!", e);
-        }
-        Intent certifyIntent = new Intent(this, CertifyKeyActivity.class);
-        certifyIntent.putExtra(CertifyKeyActivity.EXTRA_KEY_IDS, new long[]{keyId});
-        startActivityForResult(certifyIntent, 0);
-    }
-
     private void editKey(Uri dataUri) {
         Intent editIntent = new Intent(this, EditKeyActivity.class);
         editIntent.setData(KeychainContract.KeyRingData.buildSecretKeyRingUri(dataUri));
@@ -641,7 +634,10 @@ public class ViewKeyActivity extends BaseActivity implements
                     boolean isRevoked = data.getInt(INDEX_IS_REVOKED) > 0;
                     boolean isExpired = !data.isNull(INDEX_EXPIRY)
                             && new Date(data.getLong(INDEX_EXPIRY) * 1000).before(new Date());
-                    boolean isVerified = data.getInt(INDEX_VERIFIED) > 0;
+                    mIsVerified = data.getInt(INDEX_VERIFIED) > 0;
+
+                    // re-create options menu based on mIsSecret, mIsVerified
+                    supportInvalidateOptionsMenu();
 
                     AsyncTask<String, Void, Bitmap> photoTask =
                             new AsyncTask<String, Void, Bitmap>() {
@@ -666,7 +662,6 @@ public class ViewKeyActivity extends BaseActivity implements
 
                         mActionEncryptFile.setVisibility(View.GONE);
                         mActionEncryptText.setVisibility(View.GONE);
-                        mActionVerify.setVisibility(View.GONE);
                         mActionNfc.setVisibility(View.GONE);
                         mFab.setVisibility(View.GONE);
                         mQrCodeLayout.setVisibility(View.GONE);
@@ -683,14 +678,10 @@ public class ViewKeyActivity extends BaseActivity implements
 
                         mActionEncryptFile.setVisibility(View.GONE);
                         mActionEncryptText.setVisibility(View.GONE);
-                        mActionVerify.setVisibility(View.GONE);
                         mActionNfc.setVisibility(View.GONE);
                         mFab.setVisibility(View.GONE);
                         mQrCodeLayout.setVisibility(View.GONE);
                     } else if (mIsSecret) {
-                        // re-create options menu to see edit button
-                        supportInvalidateOptionsMenu();
-
                         mStatusText.setText(R.string.view_key_my_key);
                         mStatusImage.setVisibility(View.GONE);
                         color = getResources().getColor(R.color.primary);
@@ -720,7 +711,6 @@ public class ViewKeyActivity extends BaseActivity implements
 
                         mActionEncryptFile.setVisibility(View.VISIBLE);
                         mActionEncryptText.setVisibility(View.VISIBLE);
-                        mActionVerify.setVisibility(View.GONE);
 
                         // invokeBeam is available from API 21
                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@@ -736,7 +726,7 @@ public class ViewKeyActivity extends BaseActivity implements
                         mQrCodeLayout.setVisibility(View.GONE);
                         mActionNfc.setVisibility(View.GONE);
 
-                        if (isVerified) {
+                        if (mIsVerified) {
                             mStatusText.setText(R.string.view_key_verified);
                             mStatusImage.setVisibility(View.VISIBLE);
                             KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText,
@@ -744,7 +734,6 @@ public class ViewKeyActivity extends BaseActivity implements
                             color = getResources().getColor(R.color.primary);
                             photoTask.execute(fingerprint);
 
-                            mActionVerify.setVisibility(View.GONE);
                             mFab.setVisibility(View.GONE);
                         } else {
                             mStatusText.setText(R.string.view_key_unverified);
@@ -753,7 +742,6 @@ public class ViewKeyActivity extends BaseActivity implements
                                     KeyFormattingUtils.STATE_UNVERIFIED, R.color.icons, true);
                             color = getResources().getColor(R.color.android_orange_light);
 
-                            mActionVerify.setVisibility(View.VISIBLE);
                             mFab.setVisibility(View.VISIBLE);
                         }
                     }