Merge branch 'development' of https://github.com/open-keychain/open-keychain into development

12 files changed, 582 insertions, 412 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index 6638c9944..71f6fd4bf 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -17,17 +17,12 @@
 
 package org.sufficientlysecure.keychain.ui;
 
-import android.annotation.TargetApi;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.net.Uri;
-import android.nfc.NdefMessage;
-import android.nfc.NfcAdapter;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Message;
 import android.os.Messenger;
-import android.os.Parcelable;
 import android.support.v4.app.Fragment;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -63,9 +58,6 @@ public class ImportKeysActivity extends BaseActivity {
     // Actions for internal use only:
     public static final String ACTION_IMPORT_KEY_FROM_FILE = Constants.INTENT_PREFIX
             + "IMPORT_KEY_FROM_FILE";
-    public static final String ACTION_IMPORT_KEY_FROM_NFC = Constants.INTENT_PREFIX
-            + "IMPORT_KEY_FROM_NFC";
-
     public static final String EXTRA_RESULT = "result";
 
     // only used by ACTION_IMPORT_KEY
@@ -215,15 +207,6 @@ public class ImportKeysActivity extends BaseActivity {
                 startListFragment(savedInstanceState, null, null, null);
                 break;
             }
-            case ACTION_IMPORT_KEY_FROM_NFC: {
-                // NOTE: this only displays the appropriate fragment, no actions are taken
-                startFileFragment(savedInstanceState);
-                // TODO!!!!!
-
-                // no immediate actions!
-                startListFragment(savedInstanceState, null, null, null);
-                break;
-            }
             default: {
                 startCloudFragment(savedInstanceState, null, false);
                 startListFragment(savedInstanceState, null, null, null);
@@ -433,50 +416,4 @@ public class ImportKeysActivity extends BaseActivity {
         }
     }
 
-    /**
-     * NFC
-     */
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        // Check to see if the Activity started due to an Android Beam
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            if (NfcAdapter.ACTION_NDEF_DISCOVERED.equals(getIntent().getAction())) {
-                handleActionNdefDiscovered(getIntent());
-            } else {
-                Log.d(Constants.TAG, "NFC: No NDEF discovered!");
-            }
-        } else {
-            Log.e(Constants.TAG, "Android Beam not supported by Android < 4.1");
-        }
-    }
-
-    /**
-     * NFC
-     */
-    @Override
-    public void onNewIntent(Intent intent) {
-        // onResume gets called after this to handle the intent
-        setIntent(intent);
-    }
-
-    /**
-     * NFC: Parses the NDEF Message from the intent and prints to the TextView
-     */
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
-    void handleActionNdefDiscovered(Intent intent) {
-        Parcelable[] rawMsgs = intent.getParcelableArrayExtra(NfcAdapter.EXTRA_NDEF_MESSAGES);
-        // only one message sent during the beam
-        NdefMessage msg = (NdefMessage) rawMsgs[0];
-        // record 0 contains the MIME type, record 1 is the AAR, if present
-        byte[] receivedKeyringBytes = msg.getRecords()[0].getPayload();
-
-        Intent importIntent = new Intent(this, ImportKeysActivity.class);
-        importIntent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY);
-        importIntent.putExtra(ImportKeysActivity.EXTRA_KEY_BYTES, receivedKeyringBytes);
-
-        handleActions(null, importIntent);
-    }
-
 }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeScanActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
index 1a7a028c6..4cb6c69e0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeScanActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
@@ -17,12 +17,17 @@
 
 package org.sufficientlysecure.keychain.ui;
 
+import android.annotation.TargetApi;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.net.Uri;
+import android.nfc.NdefMessage;
+import android.nfc.NfcAdapter;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Message;
 import android.os.Messenger;
+import android.os.Parcelable;
 import android.support.v4.app.FragmentActivity;
 import android.widget.Toast;
 
@@ -48,7 +53,7 @@ import java.util.Locale;
 /**
  * Proxy activity (just a transparent content view) to scan QR Codes using the Barcode Scanner app
  */
-public class QrCodeScanActivity extends FragmentActivity {
+public class ImportKeysProxyActivity extends FragmentActivity {
 
     public static final String ACTION_QR_CODE_API = OpenKeychainIntents.IMPORT_KEY_FROM_QR_CODE;
     public static final String ACTION_SCAN_WITH_RESULT = Constants.INTENT_PREFIX + "SCAN_QR_CODE_WITH_RESULT";
@@ -88,6 +93,15 @@ public class QrCodeScanActivity extends FragmentActivity {
 
             returnResult = false;
             new IntentIntegrator(this).initiateScan();
+        } else if (NfcAdapter.ACTION_NDEF_DISCOVERED.equals(getIntent().getAction())) {
+            // Check to see if the Activity started due to an Android Beam
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+                returnResult = false;
+                handleActionNdefDiscovered(getIntent());
+            } else {
+                Log.e(Constants.TAG, "Android Beam not supported by Android < 4.1");
+                finish();
+            }
         } else {
             Log.e(Constants.TAG, "No valid scheme or action given!");
             finish();
@@ -116,6 +130,7 @@ public class QrCodeScanActivity extends FragmentActivity {
             returnResult(data);
         } else {
             super.onActivityResult(requestCode, resultCode, data);
+            finish();
         }
     }
 
@@ -146,7 +161,28 @@ public class QrCodeScanActivity extends FragmentActivity {
         }
     }
 
+    public void importKeys(byte[] keyringData) {
+
+        ParcelableKeyRing keyEntry = new ParcelableKeyRing(keyringData);
+        ArrayList<ParcelableKeyRing> selectedEntries = new ArrayList<>();
+        selectedEntries.add(keyEntry);
+
+        startImportService(selectedEntries);
+
+    }
+
     public void importKeys(String fingerprint) {
+
+        ParcelableKeyRing keyEntry = new ParcelableKeyRing(fingerprint, null, null);
+        ArrayList<ParcelableKeyRing> selectedEntries = new ArrayList<>();
+        selectedEntries.add(keyEntry);
+
+        startImportService(selectedEntries);
+
+    }
+
+    private void startImportService (ArrayList<ParcelableKeyRing> keyRings) {
+
         // Message is received after importing is done in KeychainIntentService
         KeychainIntentServiceHandler serviceHandler = new KeychainIntentServiceHandler(
                 this,
@@ -180,34 +216,32 @@ public class QrCodeScanActivity extends FragmentActivity {
                         return;
                     }
 
-                    Intent certifyIntent = new Intent(QrCodeScanActivity.this, CertifyKeyActivity.class);
+                    Intent certifyIntent = new Intent(ImportKeysProxyActivity.this,
+                            CertifyKeyActivity.class);
                     certifyIntent.putExtra(CertifyKeyActivity.EXTRA_RESULT, result);
-                    certifyIntent.putExtra(CertifyKeyActivity.EXTRA_KEY_IDS, result.getImportedMasterKeyIds());
+                    certifyIntent.putExtra(CertifyKeyActivity.EXTRA_KEY_IDS,
+                            result.getImportedMasterKeyIds());
                     startActivityForResult(certifyIntent, 0);
                 }
             }
         };
 
-        // search config
-        Preferences prefs = Preferences.getPreferences(this);
-        Preferences.CloudSearchPrefs cloudPrefs = new Preferences.CloudSearchPrefs(true, true, prefs.getPreferredKeyserver());
-
-        // Send all information needed to service to query keys in other thread
-        Intent intent = new Intent(this, KeychainIntentService.class);
-
-        intent.setAction(KeychainIntentService.ACTION_IMPORT_KEYRING);
-
         // fill values for this action
         Bundle data = new Bundle();
 
-        data.putString(KeychainIntentService.IMPORT_KEY_SERVER, cloudPrefs.keyserver);
-
-        ParcelableKeyRing keyEntry = new ParcelableKeyRing(fingerprint, null, null);
-        ArrayList<ParcelableKeyRing> selectedEntries = new ArrayList<>();
-        selectedEntries.add(keyEntry);
+        // search config
+        {
+            Preferences prefs = Preferences.getPreferences(this);
+            Preferences.CloudSearchPrefs cloudPrefs =
+                    new Preferences.CloudSearchPrefs(true, true, prefs.getPreferredKeyserver());
+            data.putString(KeychainIntentService.IMPORT_KEY_SERVER, cloudPrefs.keyserver);
+        }
 
-        data.putParcelableArrayList(KeychainIntentService.IMPORT_KEY_LIST, selectedEntries);
+        data.putParcelableArrayList(KeychainIntentService.IMPORT_KEY_LIST, keyRings);
 
+        // Send all information needed to service to query keys in other thread
+        Intent intent = new Intent(this, KeychainIntentService.class);
+        intent.setAction(KeychainIntentService.ACTION_IMPORT_KEYRING);
         intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
         // Create a new Messenger for the communication back
@@ -219,6 +253,20 @@ public class QrCodeScanActivity extends FragmentActivity {
 
         // start service with intent
         startService(intent);
+
+    }
+
+    /**
+     * NFC: Parses the NDEF Message from the intent and prints to the TextView
+     */
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
+    void handleActionNdefDiscovered(Intent intent) {
+        Parcelable[] rawMsgs = intent.getParcelableArrayExtra(NfcAdapter.EXTRA_NDEF_MESSAGES);
+        // only one message sent during the beam
+        NdefMessage msg = (NdefMessage) rawMsgs[0];
+        // record 0 contains the MIME type, record 1 is the AAR, if present
+        byte[] receivedKeyringBytes = msg.getRecords()[0].getPayload();
+        importKeys(receivedKeyringBytes);
     }
 
 }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
index 3da185dd2..99714b4a0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
@@ -602,8 +602,8 @@ public class KeyListFragment extends LoaderFragment
     }
 
     private void scanQrCode() {
-        Intent scanQrCode = new Intent(getActivity(), QrCodeScanActivity.class);
-        scanQrCode.setAction(QrCodeScanActivity.ACTION_SCAN_WITH_RESULT);
+        Intent scanQrCode = new Intent(getActivity(), ImportKeysProxyActivity.class);
+        scanQrCode.setAction(ImportKeysProxyActivity.ACTION_SCAN_WITH_RESULT);
         startActivityForResult(scanQrCode, 0);
     }
 
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 e1a8981c4..afb742079 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -184,7 +184,6 @@ public class ViewKeyActivity extends BaseActivity implements
             }
         });
 
-
         // Prepare the loaders. Either re-connect with an existing ones,
         // or start new ones.
         getSupportLoaderManager().initLoader(LOADER_ID_UNIFIED, null, this);
@@ -317,8 +316,8 @@ public class ViewKeyActivity extends BaseActivity implements
     }
 
     private void scanQrCode() {
-        Intent scanQrCode = new Intent(this, QrCodeScanActivity.class);
-        scanQrCode.setAction(QrCodeScanActivity.ACTION_SCAN_WITH_RESULT);
+        Intent scanQrCode = new Intent(this, ImportKeysProxyActivity.class);
+        scanQrCode.setAction(ImportKeysProxyActivity.ACTION_SCAN_WITH_RESULT);
         startActivityForResult(scanQrCode, 0);
     }
 
@@ -447,7 +446,6 @@ public class ViewKeyActivity extends BaseActivity implements
         startActivityForResult(safeSlingerIntent, 0);
     }
 
-
     /**
      * Load QR Code asynchronously and with a fade in animation
      *
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java
index 37f9113bb..894529cc5 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java
@@ -144,6 +144,11 @@ public class ViewKeyAdvActivity extends BaseActivity implements
         mTabsAdapter.addTab(ViewKeyAdvCertsFragment.class,
                 certsBundle, getString(R.string.key_view_tab_certs));
 
+        Bundle trustBundle = new Bundle();
+        trustBundle.putParcelable(ViewKeyTrustFragment.ARG_DATA_URI, dataUri);
+        mTabsAdapter.addTab(ViewKeyTrustFragment.class,
+                trustBundle, getString(R.string.key_view_tab_keybase));
+
         // update layout after operations
         mSlidingTabLayout.setViewPager(mViewPager);
     }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvMainFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvMainFragment.java
index c9d20f9f4..fc107d794 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvMainFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvMainFragment.java
@@ -37,15 +37,11 @@ import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.compatibility.DialogFragmentWorkaround;
 import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
-import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
 import org.sufficientlysecure.keychain.provider.KeychainContract.UserPackets;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
-import org.sufficientlysecure.keychain.provider.ProviderHelper.NotFoundException;
 import org.sufficientlysecure.keychain.ui.adapter.UserIdsAdapter;
 import org.sufficientlysecure.keychain.ui.dialog.UserIdInfoDialogFragment;
-import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
-import org.sufficientlysecure.keychain.ui.util.Notify;
 import org.sufficientlysecure.keychain.util.Log;
 
 import java.util.Date;
@@ -55,24 +51,15 @@ public class ViewKeyAdvMainFragment extends LoaderFragment implements
 
     public static final String ARG_DATA_URI = "uri";
 
-    private View mActionEdit;
-    private View mActionEditDivider;
-    private View mActionEncryptFiles;
-    private View mActionEncryptText;
-    private View mActionEncryptTextText;
     private View mActionCertify;
     private View mActionCertifyText;
     private ImageView mActionCertifyImage;
-    private View mActionUpdate;
 
     private ListView mUserIds;
 
     private static final int LOADER_ID_UNIFIED = 0;
     private static final int LOADER_ID_USER_IDS = 1;
 
-    // conservative attitude
-    private boolean mHasEncrypt = true;
-
     private UserIdsAdapter mUserIdsAdapter;
 
     private Uri mDataUri;
@@ -83,18 +70,12 @@ public class ViewKeyAdvMainFragment extends LoaderFragment implements
         View view = inflater.inflate(R.layout.view_key_adv_main_fragment, getContainer());
 
         mUserIds = (ListView) view.findViewById(R.id.view_key_user_ids);
-        mActionEdit = view.findViewById(R.id.view_key_action_edit);
-        mActionEditDivider = view.findViewById(R.id.view_key_action_edit_divider);
-        mActionEncryptText = view.findViewById(R.id.view_key_action_encrypt_text);
-        mActionEncryptTextText = view.findViewById(R.id.view_key_action_encrypt_text_text);
-        mActionEncryptFiles = view.findViewById(R.id.view_key_action_encrypt_files);
         mActionCertify = view.findViewById(R.id.view_key_action_certify);
         mActionCertifyText = view.findViewById(R.id.view_key_action_certify_text);
         mActionCertifyImage = (ImageView) view.findViewById(R.id.view_key_action_certify_image);
         // make certify image gray, like action icons
         mActionCertifyImage.setColorFilter(getResources().getColor(R.color.tertiary_text_light),
                 PorterDuff.Mode.SRC_IN);
-        mActionUpdate = view.findViewById(R.id.view_key_action_update);
 
         mUserIds.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
@@ -139,37 +120,11 @@ public class ViewKeyAdvMainFragment extends LoaderFragment implements
 
         Log.i(Constants.TAG, "mDataUri: " + mDataUri.toString());
 
-        mActionEncryptFiles.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                encrypt(mDataUri, false);
-            }
-        });
-        mActionEncryptText.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                encrypt(mDataUri, true);
-            }
-        });
         mActionCertify.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 certify(mDataUri);
             }
         });
-        mActionEdit.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View view) {
-                editKey(mDataUri);
-            }
-        });
-        mActionUpdate.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View view) {
-                try {
-                    updateFromKeyserver(mDataUri, new ProviderHelper(getActivity()));
-                } catch (NotFoundException e) {
-                    Notify.showNotify(getActivity(), R.string.error_key_not_found, Notify.Style.ERROR);
-                }
-            }
-        });
 
         mUserIdsAdapter = new UserIdsAdapter(getActivity(), null, 0);
         mUserIds.setAdapter(mUserIdsAdapter);
@@ -222,45 +177,23 @@ public class ViewKeyAdvMainFragment extends LoaderFragment implements
         switch (loader.getId()) {
             case LOADER_ID_UNIFIED: {
                 if (data.moveToFirst()) {
-                    if (data.getInt(INDEX_UNIFIED_HAS_ANY_SECRET) != 0) {
-                        // edit button
-                        mActionEdit.setVisibility(View.VISIBLE);
-                        mActionEditDivider.setVisibility(View.VISIBLE);
-                    } else {
-                        // edit button
-                        mActionEdit.setVisibility(View.GONE);
-                        mActionEditDivider.setVisibility(View.GONE);
-                    }
 
                     // If this key is revoked, it cannot be used for anything!
                     if (data.getInt(INDEX_UNIFIED_IS_REVOKED) != 0) {
-                        mActionEdit.setEnabled(false);
                         mActionCertify.setEnabled(false);
                         mActionCertifyText.setEnabled(false);
-                        mActionEncryptText.setEnabled(false);
-                        mActionEncryptTextText.setEnabled(false);
-                        mActionEncryptFiles.setEnabled(false);
                     } else {
-                        mActionEdit.setEnabled(true);
 
                         Date expiryDate = new Date(data.getLong(INDEX_UNIFIED_EXPIRY) * 1000);
                         if (!data.isNull(INDEX_UNIFIED_EXPIRY) && expiryDate.before(new Date())) {
                             mActionCertify.setEnabled(false);
                             mActionCertifyText.setEnabled(false);
-                            mActionEncryptText.setEnabled(false);
-                            mActionEncryptTextText.setEnabled(false);
-                            mActionEncryptFiles.setEnabled(false);
                         } else {
                             mActionCertify.setEnabled(true);
                             mActionCertifyText.setEnabled(true);
-                            mActionEncryptText.setEnabled(true);
-                            mActionEncryptTextText.setEnabled(true);
-                            mActionEncryptFiles.setEnabled(true);
                         }
                     }
 
-                    mHasEncrypt = data.getInt(INDEX_UNIFIED_HAS_ENCRYPT) != 0;
-
                     break;
                 }
             }
@@ -286,48 +219,6 @@ public class ViewKeyAdvMainFragment extends LoaderFragment implements
         }
     }
 
-    private void encrypt(Uri dataUri, boolean text) {
-        // If there is no encryption key, don't bother.
-        if (!mHasEncrypt) {
-            Notify.showNotify(getActivity(), R.string.error_no_encrypt_subkey, Notify.Style.ERROR);
-            return;
-        }
-        try {
-            long keyId = new ProviderHelper(getActivity())
-                    .getCachedPublicKeyRing(dataUri)
-                    .extractOrGetMasterKeyId();
-            long[] encryptionKeyIds = new long[]{keyId};
-            Intent intent;
-            if (text) {
-                intent = new Intent(getActivity(), EncryptTextActivity.class);
-                intent.setAction(EncryptTextActivity.ACTION_ENCRYPT_TEXT);
-                intent.putExtra(EncryptTextActivity.EXTRA_ENCRYPTION_KEY_IDS, encryptionKeyIds);
-            } else {
-                intent = new Intent(getActivity(), EncryptFilesActivity.class);
-                intent.setAction(EncryptFilesActivity.ACTION_ENCRYPT_DATA);
-                intent.putExtra(EncryptFilesActivity.EXTRA_ENCRYPTION_KEY_IDS, encryptionKeyIds);
-            }
-            // used instead of startActivity set actionbar based on callingPackage
-            startActivityForResult(intent, 0);
-        } catch (PgpKeyNotFoundException e) {
-            Log.e(Constants.TAG, "key not found!", e);
-        }
-    }
-
-    private void updateFromKeyserver(Uri dataUri, ProviderHelper providerHelper)
-            throws ProviderHelper.NotFoundException {
-        byte[] blob = (byte[]) providerHelper.getGenericData(
-                KeychainContract.KeyRings.buildUnifiedKeyRingUri(dataUri),
-                KeychainContract.Keys.FINGERPRINT, ProviderHelper.FIELD_TYPE_BLOB);
-        String fingerprint = KeyFormattingUtils.convertFingerprintToHex(blob);
-
-        Intent queryIntent = new Intent(getActivity(), ImportKeysActivity.class);
-        queryIntent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN_RESULT);
-        queryIntent.putExtra(ImportKeysActivity.EXTRA_FINGERPRINT, fingerprint);
-
-        startActivityForResult(queryIntent, 0);
-    }
-
     private void certify(Uri dataUri) {
         long keyId = 0;
         try {
@@ -342,10 +233,4 @@ public class ViewKeyAdvMainFragment extends LoaderFragment implements
         startActivityForResult(certifyIntent, 0);
     }
 
-    private void editKey(Uri dataUri) {
-        Intent editIntent = new Intent(getActivity(), EditKeyActivity.class);
-        editIntent.setData(KeychainContract.KeyRingData.buildSecretKeyRingUri(dataUri));
-        startActivityForResult(editIntent, 0);
-    }
-
 }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java
index 6208cff4e..8d0a2dd1d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java
@@ -17,7 +17,7 @@
 
 package org.sufficientlysecure.keychain.ui;
 
-import android.annotation.TargetApi;
+import android.app.ActivityOptions;
 import android.content.Intent;
 import android.database.Cursor;
 import android.graphics.Bitmap;
@@ -26,10 +26,11 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.provider.Settings;
+import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
+import android.support.v7.widget.CardView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -47,7 +48,6 @@ import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
 import org.sufficientlysecure.keychain.provider.KeychainContract.Keys;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
-import org.sufficientlysecure.keychain.ui.dialog.ShareNfcDialogFragment;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.ui.util.Notify;
 import org.sufficientlysecure.keychain.ui.util.QrCodeUtils;
@@ -62,14 +62,13 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
     public static final String ARG_DATA_URI = "uri";
 
     private TextView mFingerprint;
-    private ImageView mFingerprintQrCode;
+    private ImageView mQrCode;
+    private CardView mQrCodeLayout;
     private View mFingerprintShareButton;
     private View mFingerprintClipboardButton;
     private View mKeyShareButton;
     private View mKeyClipboardButton;
     private ImageButton mKeySafeSlingerButton;
-    private View mNfcHelpButton;
-    private View mNfcPrefsButton;
     private View mKeyUploadButton;
 
     ProviderHelper mProviderHelper;
@@ -86,26 +85,19 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
         mProviderHelper = new ProviderHelper(ViewKeyAdvShareFragment.this.getActivity());
 
         mFingerprint = (TextView) view.findViewById(R.id.view_key_fingerprint);
-        mFingerprintQrCode = (ImageView) view.findViewById(R.id.view_key_fingerprint_qr_code_image);
+        mQrCode = (ImageView) view.findViewById(R.id.view_key_qr_code);
+        mQrCodeLayout = (CardView) view.findViewById(R.id.view_key_qr_code_layout);
         mFingerprintShareButton = view.findViewById(R.id.view_key_action_fingerprint_share);
         mFingerprintClipboardButton = view.findViewById(R.id.view_key_action_fingerprint_clipboard);
         mKeyShareButton = view.findViewById(R.id.view_key_action_key_share);
         mKeyClipboardButton = view.findViewById(R.id.view_key_action_key_clipboard);
         mKeySafeSlingerButton = (ImageButton) view.findViewById(R.id.view_key_action_key_safeslinger);
-        mNfcHelpButton = view.findViewById(R.id.view_key_action_nfc_help);
-        mNfcPrefsButton = view.findViewById(R.id.view_key_action_nfc_prefs);
         mKeyUploadButton = view.findViewById(R.id.view_key_action_upload);
 
         mKeySafeSlingerButton.setColorFilter(getResources().getColor(R.color.tertiary_text_light),
                 PorterDuff.Mode.SRC_IN);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            mNfcPrefsButton.setVisibility(View.VISIBLE);
-        } else {
-            mNfcPrefsButton.setVisibility(View.GONE);
-        }
-
-        mFingerprintQrCode.setOnClickListener(new View.OnClickListener() {
+        mQrCodeLayout.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 showQrCodeDialog();
@@ -142,18 +134,6 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
                 startSafeSlinger(mDataUri);
             }
         });
-        mNfcHelpButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                showNfcHelpDialog();
-            }
-        });
-        mNfcPrefsButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                showNfcPrefs();
-            }
-        });
         mKeyUploadButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -239,20 +219,18 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
 
     private void showQrCodeDialog() {
         Intent qrCodeIntent = new Intent(getActivity(), QrCodeViewActivity.class);
-        qrCodeIntent.setData(mDataUri);
-        startActivity(qrCodeIntent);
-    }
 
-    private void showNfcHelpDialog() {
-        ShareNfcDialogFragment dialog = ShareNfcDialogFragment.newInstance();
-        dialog.show(getActivity().getSupportFragmentManager(), "shareNfcDialog");
-    }
+        // create the transition animation - the images in the layouts
+        // of both activities are defined with android:transitionName="qr_code"
+        Bundle opts = null;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            ActivityOptions options = ActivityOptions
+                    .makeSceneTransitionAnimation(getActivity(), mQrCodeLayout, "qr_code");
+            opts = options.toBundle();
+        }
 
-    @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
-    private void showNfcPrefs() {
-        Intent intentSettings = new Intent(
-                Settings.ACTION_NFCSHARING_SETTINGS);
-        startActivity(intentSettings);
+        qrCodeIntent.setData(mDataUri);
+        ActivityCompat.startActivity(getActivity(), qrCodeIntent, opts);
     }
 
     @Override
@@ -363,14 +341,14 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
                             // scale the image up to our actual size. we do this in code rather
                             // than let the ImageView do this because we don't require filtering.
                             Bitmap scaled = Bitmap.createScaledBitmap(qrCode,
-                                    mFingerprintQrCode.getHeight(), mFingerprintQrCode.getHeight(),
+                                    mQrCode.getHeight(), mQrCode.getHeight(),
                                     false);
-                            mFingerprintQrCode.setImageBitmap(scaled);
+                            mQrCode.setImageBitmap(scaled);
 
                             // simple fade-in animation
                             AlphaAnimation anim = new AlphaAnimation(0.0f, 1.0f);
                             anim.setDuration(200);
-                            mFingerprintQrCode.startAnimation(anim);
+                            mQrCode.startAnimation(anim);
                         }
                     }
                 };
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java
new file mode 100644
index 000000000..5483d16b8
--- /dev/null
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java
@@ -0,0 +1,460 @@
+/*
+ * Copyright (C) 2014 Tim Bray <tbray@textuality.com>
+ *
+ * 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.app.ProgressDialog;
+import android.content.Intent;
+import android.database.Cursor;
+import android.graphics.Typeface;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.Message;
+import android.os.Messenger;
+import android.support.v4.app.LoaderManager;
+import android.support.v4.content.CursorLoader;
+import android.support.v4.content.Loader;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
+import android.text.style.StyleSpan;
+import android.text.style.URLSpan;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TableLayout;
+import android.widget.TableRow;
+import android.widget.TextView;
+
+import com.textuality.keybase.lib.KeybaseException;
+import com.textuality.keybase.lib.Proof;
+import com.textuality.keybase.lib.User;
+
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
+import org.sufficientlysecure.keychain.service.KeychainIntentService;
+import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
+import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
+import org.sufficientlysecure.keychain.util.Log;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Hashtable;
+import java.util.List;
+
+public class ViewKeyTrustFragment extends LoaderFragment implements
+        LoaderManager.LoaderCallbacks<Cursor> {
+
+    public static final String ARG_DATA_URI = "uri";
+
+    private View mStartSearch;
+    private TextView mTrustReadout;
+    private TextView mReportHeader;
+    private TableLayout mProofListing;
+    private LayoutInflater mInflater;
+    private View mProofVerifyHeader;
+    private TextView mProofVerifyDetail;
+
+    private static final int LOADER_ID_DATABASE = 1;
+
+    // for retrieving the key we’re working on
+    private Uri mDataUri;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup superContainer, Bundle savedInstanceState) {
+        View root = super.onCreateView(inflater, superContainer, savedInstanceState);
+        View view = inflater.inflate(R.layout.view_key_trust_fragment, getContainer());
+        mInflater = inflater;
+
+        mTrustReadout = (TextView) view.findViewById(R.id.view_key_trust_readout);
+        mStartSearch = view.findViewById(R.id.view_key_trust_search_cloud);
+        mStartSearch.setEnabled(false);
+        mReportHeader = (TextView) view.findViewById(R.id.view_key_trust_cloud_narrative);
+        mProofListing = (TableLayout) view.findViewById(R.id.view_key_proof_list);
+        mProofVerifyHeader = view.findViewById(R.id.view_key_proof_verify_header);
+        mProofVerifyDetail = (TextView) view.findViewById(R.id.view_key_proof_verify_detail);
+        mReportHeader.setVisibility(View.GONE);
+        mProofListing.setVisibility(View.GONE);
+        mProofVerifyHeader.setVisibility(View.GONE);
+        mProofVerifyDetail.setVisibility(View.GONE);
+
+        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;
+        }
+        mDataUri = dataUri;
+
+        // retrieve the key from the database
+        getLoaderManager().initLoader(LOADER_ID_DATABASE, null, this);
+    }
+
+    static final String[] TRUST_PROJECTION = new String[]{
+            KeyRings._ID, KeyRings.FINGERPRINT, KeyRings.IS_REVOKED, KeyRings.EXPIRY,
+            KeyRings.HAS_ANY_SECRET, KeyRings.VERIFIED
+    };
+    static final int INDEX_TRUST_FINGERPRINT = 1;
+    static final int INDEX_TRUST_IS_REVOKED = 2;
+    static final int INDEX_TRUST_EXPIRY = 3;
+    static final int INDEX_UNIFIED_HAS_ANY_SECRET = 4;
+    static final int INDEX_VERIFIED = 5;
+
+    public Loader<Cursor> onCreateLoader(int id, Bundle args) {
+        setContentShown(false);
+
+        switch (id) {
+            case LOADER_ID_DATABASE: {
+                Uri baseUri = KeyRings.buildUnifiedKeyRingUri(mDataUri);
+                return new CursorLoader(getActivity(), baseUri, TRUST_PROJECTION, null, null, null);
+            }
+            // decided to just use an AsyncTask for keybase, but maybe later
+            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;
+        }
+
+        boolean nothingSpecial = true;
+        StringBuilder message = new StringBuilder();
+
+        // Swap the new cursor in. (The framework will take care of closing the
+        // old cursor once we return.)
+        if (data.moveToFirst()) {
+
+            if (data.getInt(INDEX_UNIFIED_HAS_ANY_SECRET) != 0) {
+                message.append(getString(R.string.key_trust_it_is_yours)).append("\n");
+                nothingSpecial = false;
+            } else if (data.getInt(INDEX_VERIFIED) != 0) {
+                message.append(getString(R.string.key_trust_already_verified)).append("\n");
+                nothingSpecial = false;
+            }
+
+            // If this key is revoked, don’t trust it!
+            if (data.getInt(INDEX_TRUST_IS_REVOKED) != 0) {
+                message.append(getString(R.string.key_trust_revoked)).
+                        append(getString(R.string.key_trust_old_keys));
+
+                nothingSpecial = false;
+            } else {
+                Date expiryDate = new Date(data.getLong(INDEX_TRUST_EXPIRY) * 1000);
+                if (!data.isNull(INDEX_TRUST_EXPIRY) && expiryDate.before(new Date())) {
+
+                    // if expired, don’t trust it!
+                    message.append(getString(R.string.key_trust_expired)).
+                            append(getString(R.string.key_trust_old_keys));
+
+                    nothingSpecial = false;
+                }
+            }
+
+            if (nothingSpecial) {
+                message.append(getString(R.string.key_trust_maybe));
+            }
+
+            final byte[] fp = data.getBlob(INDEX_TRUST_FINGERPRINT);
+            final String fingerprint = KeyFormattingUtils.convertFingerprintToHex(fp);
+            if (fingerprint != null) {
+
+                mStartSearch.setEnabled(true);
+                mStartSearch.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        mStartSearch.setEnabled(false);
+                        new DescribeKey().execute(fingerprint);
+                    }
+                });
+            }
+        }
+
+        mTrustReadout.setText(message);
+        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) {
+        // no-op in this case I think
+    }
+
+    class ResultPage {
+        String mHeader;
+        final List<CharSequence> mProofs;
+
+        public ResultPage(String header, List<CharSequence> proofs) {
+            mHeader = header;
+            mProofs = proofs;
+        }
+    }
+
+    // look for evidence from keybase in the background, make tabular version of result
+    //
+    private class DescribeKey extends AsyncTask<String, Void, ResultPage> {
+
+        @Override
+        protected ResultPage doInBackground(String... args) {
+            String fingerprint = args[0];
+
+            final ArrayList<CharSequence> proofList = new ArrayList<CharSequence>();
+            final Hashtable<Integer, ArrayList<Proof>> proofs = new Hashtable<Integer, ArrayList<Proof>>();
+            try {
+                User keybaseUser = User.findByFingerprint(fingerprint);
+                for (Proof proof : keybaseUser.getProofs()) {
+                    Integer proofType = proof.getType();
+                    appendIfOK(proofs, proofType, proof);
+                }
+
+                // a one-liner in a modern programming language
+                for (Integer proofType : proofs.keySet()) {
+                    Proof[] x = {};
+                    Proof[] proofsFor = proofs.get(proofType).toArray(x);
+                    if (proofsFor.length > 0) {
+                        SpannableStringBuilder ssb = new SpannableStringBuilder();
+                        ssb.append(getProofNarrative(proofType)).append(" ");
+
+                        int i = 0;
+                        while (i < proofsFor.length - 1) {
+                            appendProofLinks(ssb, fingerprint, proofsFor[i]);
+                            ssb.append(", ");
+                            i++;
+                        }
+                        appendProofLinks(ssb, fingerprint, proofsFor[i]);
+                        proofList.add(ssb);
+                    }
+                }
+
+            } catch (KeybaseException ignored) {
+            }
+
+            return new ResultPage(getString(R.string.key_trust_results_prefix), proofList);
+        }
+
+        private SpannableStringBuilder appendProofLinks(SpannableStringBuilder ssb, final String fingerprint, final Proof proof) throws KeybaseException {
+            int startAt = ssb.length();
+            String handle = proof.getHandle();
+            ssb.append(handle);
+            ssb.setSpan(new URLSpan(proof.getServiceUrl()), startAt, startAt + handle.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            if (haveProofFor(proof.getType())) {
+                ssb.append("\u00a0[");
+                startAt = ssb.length();
+                String verify = getString(R.string.keybase_verify);
+                ssb.append(verify);
+                ClickableSpan clicker = new ClickableSpan() {
+                    @Override
+                    public void onClick(View view) {
+                        verify(proof, fingerprint);
+                    }
+                };
+                ssb.setSpan(clicker, startAt, startAt + verify.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                ssb.append("]");
+            }
+            return ssb;
+        }
+
+        @Override
+        protected void onPostExecute(ResultPage result) {
+            super.onPostExecute(result);
+            if (result.mProofs.isEmpty()) {
+                result.mHeader = getActivity().getString(R.string.key_trust_no_cloud_evidence);
+            }
+
+            mStartSearch.setVisibility(View.GONE);
+            mReportHeader.setVisibility(View.VISIBLE);
+            mProofListing.setVisibility(View.VISIBLE);
+            mReportHeader.setText(result.mHeader);
+
+            int rowNumber = 1;
+            for (CharSequence s : result.mProofs) {
+                TableRow row = (TableRow) mInflater.inflate(R.layout.view_key_keybase_proof, null);
+                TextView number = (TextView) row.findViewById(R.id.proof_number);
+                TextView text = (TextView) row.findViewById(R.id.proof_text);
+                number.setText(Integer.toString(rowNumber++) + ". ");
+                text.setText(s);
+                text.setMovementMethod(LinkMovementMethod.getInstance());
+                mProofListing.addView(row);
+            }
+
+            // mSearchReport.loadDataWithBaseURL("file:///android_res/drawable/", s, "text/html", "UTF-8", null);
+        }
+    }
+
+    private String getProofNarrative(int proofType) {
+        int stringIndex;
+        switch (proofType) {
+            case Proof.PROOF_TYPE_TWITTER: stringIndex = R.string.keybase_narrative_twitter; break;
+            case Proof.PROOF_TYPE_GITHUB: stringIndex = R.string.keybase_narrative_github; break;
+            case Proof.PROOF_TYPE_DNS: stringIndex = R.string.keybase_narrative_dns; break;
+            case Proof.PROOF_TYPE_WEB_SITE: stringIndex = R.string.keybase_narrative_web_site; break;
+            case Proof.PROOF_TYPE_HACKERNEWS: stringIndex = R.string.keybase_narrative_hackernews; break;
+            case Proof.PROOF_TYPE_COINBASE: stringIndex = R.string.keybase_narrative_coinbase; break;
+            case Proof.PROOF_TYPE_REDDIT: stringIndex = R.string.keybase_narrative_reddit; break;
+            default: stringIndex = R.string.keybase_narrative_unknown;
+        }
+        return getActivity().getString(stringIndex);
+    }
+
+    private void appendIfOK(Hashtable<Integer, ArrayList<Proof>> table, Integer proofType, Proof proof) throws KeybaseException {
+        ArrayList<Proof> list = table.get(proofType);
+        if (list == null) {
+            list = new ArrayList<Proof>();
+            table.put(proofType, list);
+        }
+        list.add(proof);
+    }
+
+    // which proofs do we have working verifiers for?
+    private boolean haveProofFor(int proofType) {
+        switch (proofType) {
+            case Proof.PROOF_TYPE_TWITTER: return true;
+            case Proof.PROOF_TYPE_GITHUB: return true;
+            case Proof.PROOF_TYPE_DNS: return true;
+            case Proof.PROOF_TYPE_WEB_SITE: return true;
+            case Proof.PROOF_TYPE_HACKERNEWS: return true;
+            case Proof.PROOF_TYPE_COINBASE: return true;
+            case Proof.PROOF_TYPE_REDDIT: return true;
+            default: return false;
+        }
+    }
+
+    private void verify(final Proof proof, final String fingerprint) {
+        Intent intent = new Intent(getActivity(), KeychainIntentService.class);
+        Bundle data = new Bundle();
+        intent.setAction(KeychainIntentService.ACTION_VERIFY_KEYBASE_PROOF);
+
+        data.putString(KeychainIntentService.KEYBASE_PROOF, proof.toString());
+        data.putString(KeychainIntentService.KEYBASE_REQUIRED_FINGERPRINT, fingerprint);
+        intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
+
+        mProofVerifyDetail.setVisibility(View.GONE);
+
+        // Create a new Messenger for the communication back after proof work is done
+        //
+        KeychainIntentServiceHandler handler = new KeychainIntentServiceHandler(getActivity(),
+                getString(R.string.progress_verifying_signature), ProgressDialog.STYLE_HORIZONTAL) {
+            public void handleMessage(Message message) {
+                // handle messages by standard KeychainIntentServiceHandler first
+                super.handleMessage(message);
+
+                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
+                    Bundle returnData = message.getData();
+                    String msg = returnData.getString(KeychainIntentServiceHandler.DATA_MESSAGE);
+                    SpannableStringBuilder ssb = new SpannableStringBuilder();
+
+                    if ((msg != null) && msg.equals("OK")) {
+
+                        //yay
+                        String proofUrl = returnData.getString(KeychainIntentServiceHandler.KEYBASE_PROOF_URL);
+                        String presenceUrl = returnData.getString(KeychainIntentServiceHandler.KEYBASE_PRESENCE_URL);
+                        String presenceLabel = returnData.getString(KeychainIntentServiceHandler.KEYBASE_PRESENCE_LABEL);
+
+                        String proofLabel;
+                        switch (proof.getType()) {
+                            case Proof.PROOF_TYPE_TWITTER:
+                                proofLabel = getString(R.string.keybase_twitter_proof);
+                                break;
+                            case Proof.PROOF_TYPE_DNS:
+                                proofLabel = getString(R.string.keybase_dns_proof);
+                                break;
+                            case Proof.PROOF_TYPE_WEB_SITE:
+                                proofLabel = getString(R.string.keybase_web_site_proof);
+                                break;
+                            case Proof.PROOF_TYPE_GITHUB:
+                                proofLabel = getString(R.string.keybase_github_proof);
+                                break;
+                            case Proof.PROOF_TYPE_REDDIT:
+                                proofLabel = getString(R.string.keybase_reddit_proof);
+                                break;
+                            default:
+                                proofLabel = getString(R.string.keybase_a_post);
+                                break;
+                        }
+
+                        ssb.append(getString(R.string.keybase_proof_succeeded));
+                        StyleSpan bold = new StyleSpan(Typeface.BOLD);
+                        ssb.setSpan(bold, 0, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                        ssb.append("\n\n");
+                        int length = ssb.length();
+                        ssb.append(proofLabel);
+                        if (proofUrl != null) {
+                            URLSpan postLink = new URLSpan(proofUrl);
+                            ssb.setSpan(postLink, length, length + proofLabel.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                        }
+                        if (Proof.PROOF_TYPE_DNS == proof.getType()) {
+                            ssb.append(" ").append(getString(R.string.keybase_for_the_domain)).append(" ");
+                        } else {
+                            ssb.append(" ").append(getString(R.string.keybase_fetched_from)).append(" ");
+                        }
+                        length = ssb.length();
+                        URLSpan presenceLink = new URLSpan(presenceUrl);
+                        ssb.append(presenceLabel);
+                        ssb.setSpan(presenceLink, length, length + presenceLabel.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                        if (Proof.PROOF_TYPE_REDDIT == proof.getType()) {
+                            ssb.append(", ").
+                                    append(getString(R.string.keybase_reddit_attribution)).
+                                    append(" “").append(proof.getHandle()).append("”, ");
+                        }
+                        ssb.append(" ").append(getString(R.string.keybase_contained_signature));
+                    } else {
+                        // verification failed!
+                        msg = returnData.getString(KeychainIntentServiceHandler.DATA_ERROR);
+                        ssb.append(getString(R.string.keybase_proof_failure));
+                        if (msg == null) {
+                            msg = getString(R.string.keybase_unknown_proof_failure);
+                        }
+                        StyleSpan bold = new StyleSpan(Typeface.BOLD);
+                        ssb.setSpan(bold, 0, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                        ssb.append("\n\n").append(msg);
+                    }
+                    mProofVerifyHeader.setVisibility(View.VISIBLE);
+                    mProofVerifyDetail.setVisibility(View.VISIBLE);
+                    mProofVerifyDetail.setMovementMethod(LinkMovementMethod.getInstance());
+                    mProofVerifyDetail.setText(ssb);
+                }
+            }
+        };
+
+        // Create a new Messenger for the communication back
+        Messenger messenger = new Messenger(handler);
+        intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
+
+        // show progress dialog
+        handler.showProgressDialog(getActivity());
+
+        // start service with intent
+        getActivity().startService(intent);
+    }
+}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
index 598793233..6ba9e26ad 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
@@ -213,8 +213,24 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
             // destroyLoader view from holder
             holder.userIdsList.removeAllViews();
 
+            // we want conventional gpg UserIDs first, then Keybase ”proofs”
             HashMap<String, HashSet<String>> mergedUserIds = entry.getMergedUserIds();
-            for (Map.Entry<String, HashSet<String>> pair : mergedUserIds.entrySet()) {
+            ArrayList<Map.Entry<String, HashSet<String>>> sortedIds = new ArrayList<Map.Entry<String, HashSet<String>>>(mergedUserIds.entrySet());
+            java.util.Collections.sort(sortedIds, new java.util.Comparator<Map.Entry<String, HashSet<String>>>() {
+                @Override
+                public int compare(Map.Entry<String, HashSet<String>> entry1, Map.Entry<String, HashSet<String>> entry2) {
+
+                    // sort keybase UserIds after non-Keybase
+                    boolean e1IsKeybase = entry1.getKey().contains(":");
+                    boolean e2IsKeybase = entry2.getKey().contains(":");
+                    if (e1IsKeybase != e2IsKeybase) {
+                        return (e1IsKeybase) ? 1 : -1;
+                    }
+                    return entry1.getKey().compareTo(entry2.getKey());
+                }
+            });
+
+            for (Map.Entry<String, HashSet<String>> pair : sortedIds) {
                 String cUserId = pair.getKey();
                 HashSet<String> cEmails = pair.getValue();
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/BadImportKeyDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/BadImportKeyDialogFragment.java
deleted file mode 100644
index 19cf27259..000000000
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/BadImportKeyDialogFragment.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2012-2014 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.dialog;
-
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentActivity;
-
-import org.sufficientlysecure.keychain.R;
-
-public class BadImportKeyDialogFragment extends DialogFragment {
-    private static final String ARG_BAD_IMPORT = "bad_import";
-
-    /**
-     * Creates a new instance of this Bad Import Key DialogFragment
-     *
-     * @param bad
-     * @return
-     */
-    public static BadImportKeyDialogFragment newInstance(int bad) {
-        BadImportKeyDialogFragment frag = new BadImportKeyDialogFragment();
-        Bundle args = new Bundle();
-
-        args.putInt(ARG_BAD_IMPORT, bad);
-        frag.setArguments(args);
-
-        return frag;
-    }
-
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final FragmentActivity activity = getActivity();
-        final int badImport = getArguments().getInt(ARG_BAD_IMPORT);
-
-        CustomAlertDialogBuilder alert = new CustomAlertDialogBuilder(activity);
-        alert.setIcon(R.drawable.ic_dialog_alert_holo_light);
-        alert.setTitle(R.string.warning);
-        alert.setMessage(activity.getResources()
-                .getQuantityString(R.plurals.bad_keys_encountered, badImport, badImport));
-        alert.setPositiveButton(android.R.string.ok,
-                new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int id) {
-                        dialog.cancel();
-                    }
-                });
-        alert.setCancelable(true);
-
-        return alert.show();
-    }
-}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
index 5b96ea231..802f0c11b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
@@ -33,6 +33,7 @@ import android.widget.TextView;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.pgp.KeyRing;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.service.KeychainIntentService;
@@ -100,14 +101,20 @@ public class DeleteKeyDialogFragment extends DialogFragment {
                                 ProviderHelper.FIELD_TYPE_INTEGER
                         }
                 );
-                String userId = (String) data.get(KeyRings.USER_ID);
+                String name;
+                String[] mainUserId = KeyRing.splitUserId((String) data.get(KeyRings.USER_ID));
+                if (mainUserId[0] != null) {
+                    name = mainUserId[0];
+                } else {
+                    name = getString(R.string.user_id_no_name);
+                }
                 hasSecret = ((Long) data.get(KeyRings.HAS_ANY_SECRET)) == 1;
 
                 // Set message depending on which key it is.
                 mMainMessage.setText(getString(
                         hasSecret ? R.string.secret_key_deletion_confirmation
                                 : R.string.public_key_deletetion_confirmation,
-                        userId
+                        name
                 ));
             } catch (ProviderHelper.NotFoundException e) {
                 dismiss();
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java
deleted file mode 100644
index 961f92f03..000000000
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2013-2014 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.dialog;
-
-import android.annotation.TargetApi;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.nfc.NfcAdapter;
-import android.os.Build;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentActivity;
-
-import org.sufficientlysecure.htmltextview.HtmlTextView;
-import org.sufficientlysecure.keychain.R;
-
-@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
-public class ShareNfcDialogFragment extends DialogFragment {
-
-    /**
-     * Creates new instance of this fragment
-     */
-    public static ShareNfcDialogFragment newInstance() {
-        ShareNfcDialogFragment frag = new ShareNfcDialogFragment();
-
-        return frag;
-    }
-
-    /**
-     * Creates dialog
-     */
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final FragmentActivity activity = getActivity();
-
-        CustomAlertDialogBuilder alert = new CustomAlertDialogBuilder(activity);
-
-        alert.setTitle(R.string.share_nfc_dialog);
-        alert.setCancelable(true);
-
-        alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int id) {
-                dismiss();
-            }
-        });
-
-        HtmlTextView textView = new HtmlTextView(getActivity());
-        textView.setPadding(8, 8, 8, 8);
-        alert.setView(textView);
-
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
-            textView.setText(getString(R.string.error) + ": "
-                    + getString(R.string.error_jelly_bean_needed));
-        } else {
-            // check if NFC Adapter is available
-            NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
-            if (nfcAdapter == null) {
-                textView.setText(getString(R.string.error) + ": "
-                        + getString(R.string.error_nfc_needed));
-            } else {
-                // nfc works...
-                textView.setHtmlFromRawResource(getActivity(), R.raw.nfc_beam_share, true);
-
-                alert.setNegativeButton(R.string.menu_beam_preferences,
-                        new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int id) {
-                                Intent intentSettings = new Intent(
-                                        Settings.ACTION_NFCSHARING_SETTINGS);
-                                startActivity(intentSettings);
-                            }
-                        }
-                );
-            }
-        }
-        
-        return alert.show();
-    }
-}