fixes to clipboard management

5 files changed, 600 insertions, 560 deletions

diff --git a/src/org/thialfihar/android/apg/DecryptActivity.java b/src/org/thialfihar/android/apg/DecryptActivity.java
index ca7562801..cd4ef00f6 100644
--- a/src/org/thialfihar/android/apg/DecryptActivity.java
+++ b/src/org/thialfihar/android/apg/DecryptActivity.java
@@ -20,6 +20,7 @@ import org.spongycastle.jce.provider.BouncyCastleProvider;
 import org.spongycastle.openpgp.PGPException;
 import org.spongycastle.openpgp.PGPPublicKeyRing;
 import org.thialfihar.android.apg.provider.DataProvider;
+import org.thialfihar.android.apg.utils.Compatibility;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -29,7 +30,6 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Message;
-import android.text.ClipboardManager;
 import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -111,9 +111,9 @@ public class DecryptActivity extends BaseActivity {
         mSourcePrevious.setOnClickListener(new OnClickListener() {
             public void onClick(View v) {
                 mSource.setInAnimation(AnimationUtils.loadAnimation(DecryptActivity.this,
-                                                                    R.anim.push_right_in));
+                        R.anim.push_right_in));
                 mSource.setOutAnimation(AnimationUtils.loadAnimation(DecryptActivity.this,
-                                                                     R.anim.push_right_out));
+                        R.anim.push_right_out));
                 mSource.showPrevious();
                 updateSource();
             }
@@ -123,9 +123,9 @@ public class DecryptActivity extends BaseActivity {
         OnClickListener nextSourceClickListener = new OnClickListener() {
             public void onClick(View v) {
                 mSource.setInAnimation(AnimationUtils.loadAnimation(DecryptActivity.this,
-                                                                    R.anim.push_left_in));
+                        R.anim.push_left_in));
                 mSource.setOutAnimation(AnimationUtils.loadAnimation(DecryptActivity.this,
-                                                                     R.anim.push_left_out));
+                        R.anim.push_left_out));
                 mSource.showNext();
                 updateSource();
             }
@@ -275,18 +275,22 @@ public class DecryptActivity extends BaseActivity {
             mReturnResult = true;
         }
 
-        if (mSource.getCurrentView().getId() == R.id.sourceMessage &&
-            mMessage.getText().length() == 0) {
-            ClipboardManager clip = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
+        if (mSource.getCurrentView().getId() == R.id.sourceMessage
+                && mMessage.getText().length() == 0) {
+
+            CharSequence clipboardText = Compatibility.getClipboardText(this);
+
             String data = "";
-            Matcher matcher = Apg.PGP_MESSAGE.matcher(clip.getText());
-            if (!matcher.matches()) {
-                matcher = Apg.PGP_SIGNED_MESSAGE.matcher(clip.getText());
-            }
-            if (matcher.matches()) {
-                data = matcher.group(1);
-                mMessage.setText(data);
-                Toast.makeText(this, R.string.usingClipboardContent, Toast.LENGTH_SHORT).show();
+            if (clipboardText != null) {
+                Matcher matcher = Apg.PGP_MESSAGE.matcher(clipboardText);
+                if (!matcher.matches()) {
+                    matcher = Apg.PGP_SIGNED_MESSAGE.matcher(clipboardText);
+                }
+                if (matcher.matches()) {
+                    data = matcher.group(1);
+                    mMessage.setText(data);
+                    Toast.makeText(this, R.string.usingClipboardContent, Toast.LENGTH_SHORT).show();
+                }
             }
         }
 
@@ -334,9 +338,9 @@ public class DecryptActivity extends BaseActivity {
 
         updateSource();
 
-        if (mSource.getCurrentView().getId() == R.id.sourceMessage &&
-            (mMessage.getText().length() > 0 || mData != null || mContentUri != null)) {
-             mDecryptButton.performClick();
+        if (mSource.getCurrentView().getId() == R.id.sourceMessage
+                && (mMessage.getText().length() > 0 || mData != null || mContentUri != null)) {
+            mDecryptButton.performClick();
         }
     }
 
@@ -369,21 +373,21 @@ public class DecryptActivity extends BaseActivity {
 
     private void updateSource() {
         switch (mSource.getCurrentView().getId()) {
-            case R.id.sourceFile: {
-                mSourceLabel.setText(R.string.label_file);
-                mDecryptButton.setText(R.string.btn_decrypt);
-                break;
-            }
+        case R.id.sourceFile: {
+            mSourceLabel.setText(R.string.label_file);
+            mDecryptButton.setText(R.string.btn_decrypt);
+            break;
+        }
 
-            case R.id.sourceMessage: {
-                mSourceLabel.setText(R.string.label_message);
-                mDecryptButton.setText(R.string.btn_decrypt);
-                break;
-            }
+        case R.id.sourceMessage: {
+            mSourceLabel.setText(R.string.label_message);
+            mDecryptButton.setText(R.string.btn_decrypt);
+            break;
+        }
 
-            default: {
-                break;
-            }
+        default: {
+            break;
+        }
         }
     }
 
@@ -411,9 +415,10 @@ public class DecryptActivity extends BaseActivity {
             if (mInputFilename.startsWith("file")) {
                 File file = new File(mInputFilename);
                 if (!file.exists() || !file.isFile()) {
-                    Toast.makeText(this, getString(R.string.errorMessage,
-                                                   getString(R.string.error_fileNotFound)),
-                                   Toast.LENGTH_SHORT).show();
+                    Toast.makeText(
+                            this,
+                            getString(R.string.errorMessage, getString(R.string.error_fileNotFound)),
+                            Toast.LENGTH_SHORT).show();
                     return;
                 }
             }
@@ -450,8 +455,8 @@ public class DecryptActivity extends BaseActivity {
                 mAssumeSymmetricEncryption = true;
             }
 
-            if (getSecretKeyId() == Id.key.symmetric ||
-                Apg.getCachedPassPhrase(getSecretKeyId()) == null) {
+            if (getSecretKeyId() == Id.key.symmetric
+                    || Apg.getCachedPassPhrase(getSecretKeyId()) == null) {
                 showDialog(Id.dialog.pass_phrase);
             } else {
                 if (mDecryptTarget == Id.target.file) {
@@ -468,8 +473,8 @@ public class DecryptActivity extends BaseActivity {
             error = "" + e;
         }
         if (error != null) {
-            Toast.makeText(this, getString(R.string.errorMessage, error),
-                           Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, getString(R.string.errorMessage, error), Toast.LENGTH_SHORT)
+                    .show();
         }
     }
 
@@ -522,22 +527,22 @@ public class DecryptActivity extends BaseActivity {
             if (mSignedOnly) {
                 data = Apg.verifyText(this, in, out, this);
             } else {
-                data = Apg.decrypt(this, in, out, Apg.getCachedPassPhrase(getSecretKeyId()),
-                                   this, mAssumeSymmetricEncryption);
+                data = Apg.decrypt(this, in, out, Apg.getCachedPassPhrase(getSecretKeyId()), this,
+                        mAssumeSymmetricEncryption);
             }
 
             out.close();
 
             if (mDataDestination.getStreamFilename() != null) {
-                data.putString(Apg.EXTRA_RESULT_URI, "content://" + DataProvider.AUTHORITY +
-                               "/data/" + mDataDestination.getStreamFilename());
+                data.putString(Apg.EXTRA_RESULT_URI, "content://" + DataProvider.AUTHORITY
+                        + "/data/" + mDataDestination.getStreamFilename());
             } else if (mDecryptTarget == Id.target.message) {
                 if (mReturnBinary) {
                     data.putByteArray(Apg.EXTRA_DECRYPTED_DATA,
-                                      ((ByteArrayOutputStream) out).toByteArray());
+                            ((ByteArrayOutputStream) out).toByteArray());
                 } else {
-                    data.putString(Apg.EXTRA_DECRYPTED_MESSAGE,
-                                   new String(((ByteArrayOutputStream) out).toByteArray()));
+                    data.putString(Apg.EXTRA_DECRYPTED_MESSAGE, new String(
+                            ((ByteArrayOutputStream) out).toByteArray()));
                 }
             }
         } catch (PGPException e) {
@@ -588,7 +593,8 @@ public class DecryptActivity extends BaseActivity {
 
         String error = data.getString(Apg.EXTRA_ERROR);
         if (error != null) {
-            Toast.makeText(this, getString(R.string.errorMessage, error), Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, getString(R.string.errorMessage, error), Toast.LENGTH_SHORT)
+                    .show();
             return;
         }
 
@@ -602,26 +608,26 @@ public class DecryptActivity extends BaseActivity {
         }
 
         switch (mDecryptTarget) {
-            case Id.target.message: {
-                String decryptedMessage = data.getString(Apg.EXTRA_DECRYPTED_MESSAGE);
-                mMessage.setText(decryptedMessage);
-                mMessage.setHorizontallyScrolling(false);
-                mReplyButton.setVisibility(View.VISIBLE);
-                break;
-            }
+        case Id.target.message: {
+            String decryptedMessage = data.getString(Apg.EXTRA_DECRYPTED_MESSAGE);
+            mMessage.setText(decryptedMessage);
+            mMessage.setHorizontallyScrolling(false);
+            mReplyButton.setVisibility(View.VISIBLE);
+            break;
+        }
 
-            case Id.target.file: {
-                if (mDeleteAfter.isChecked()) {
-                    setDeleteFile(mInputFilename);
-                    showDialog(Id.dialog.delete_file);
-                }
-                break;
+        case Id.target.file: {
+            if (mDeleteAfter.isChecked()) {
+                setDeleteFile(mInputFilename);
+                showDialog(Id.dialog.delete_file);
             }
+            break;
+        }
 
-            default: {
-                // shouldn't happen
-                break;
-            }
+        default: {
+            // shouldn't happen
+            break;
+        }
         }
 
         if (data.getBoolean(Apg.EXTRA_SIGNATURE)) {
@@ -642,7 +648,8 @@ public class DecryptActivity extends BaseActivity {
                 mSignatureStatusImage.setImageResource(R.drawable.overlay_ok);
             } else if (data.getBoolean(Apg.EXTRA_SIGNATURE_UNKNOWN)) {
                 mSignatureStatusImage.setImageResource(R.drawable.overlay_error);
-                Toast.makeText(this, R.string.unknownSignatureKeyTouchToLookUp, Toast.LENGTH_LONG).show();
+                Toast.makeText(this, R.string.unknownSignatureKeyTouchToLookUp, Toast.LENGTH_LONG)
+                        .show();
             } else {
                 mSignatureStatusImage.setImageResource(R.drawable.overlay_error);
             }
@@ -653,51 +660,51 @@ public class DecryptActivity extends BaseActivity {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
-            case Id.request.filename: {
-                if (resultCode == RESULT_OK && data != null) {
-                    String filename = data.getDataString();
-                    if (filename != null) {
-                        // Get rid of URI prefix:
-                        if (filename.startsWith("file://")) {
-                            filename = filename.substring(7);
-                        }
-                        // replace %20 and so on
-                        filename = Uri.decode(filename);
-
-                        mFilename.setText(filename);
+        case Id.request.filename: {
+            if (resultCode == RESULT_OK && data != null) {
+                String filename = data.getDataString();
+                if (filename != null) {
+                    // Get rid of URI prefix:
+                    if (filename.startsWith("file://")) {
+                        filename = filename.substring(7);
                     }
+                    // replace %20 and so on
+                    filename = Uri.decode(filename);
+
+                    mFilename.setText(filename);
                 }
-                return;
             }
+            return;
+        }
 
-            case Id.request.output_filename: {
-                if (resultCode == RESULT_OK && data != null) {
-                    String filename = data.getDataString();
-                    if (filename != null) {
-                        // Get rid of URI prefix:
-                        if (filename.startsWith("file://")) {
-                            filename = filename.substring(7);
-                        }
-                        // replace %20 and so on
-                        filename = Uri.decode(filename);
-
-                        FileDialog.setFilename(filename);
+        case Id.request.output_filename: {
+            if (resultCode == RESULT_OK && data != null) {
+                String filename = data.getDataString();
+                if (filename != null) {
+                    // Get rid of URI prefix:
+                    if (filename.startsWith("file://")) {
+                        filename = filename.substring(7);
                     }
-                }
-                return;
-            }
+                    // replace %20 and so on
+                    filename = Uri.decode(filename);
 
-            case Id.request.look_up_key_id: {
-                PausableThread thread = getRunningThread();
-                if (thread != null && thread.isPaused()) {
-                    thread.unpause();
+                    FileDialog.setFilename(filename);
                 }
-                return;
             }
+            return;
+        }
 
-            default: {
-                break;
+        case Id.request.look_up_key_id: {
+            PausableThread thread = getRunningThread();
+            if (thread != null && thread.isPaused()) {
+                thread.unpause();
             }
+            return;
+        }
+
+        default: {
+            break;
+        }
         }
 
         super.onActivityResult(requestCode, resultCode, data);
@@ -706,63 +713,57 @@ public class DecryptActivity extends BaseActivity {
     @Override
     protected Dialog onCreateDialog(int id) {
         switch (id) {
-            case Id.dialog.output_filename: {
-                return FileDialog.build(this, getString(R.string.title_decryptToFile),
-                                        getString(R.string.specifyFileToDecryptTo),
-                                        mOutputFilename,
-                                        new FileDialog.OnClickListener() {
-                                            public void onOkClick(String filename, boolean checked) {
-                                                removeDialog(Id.dialog.output_filename);
-                                                mOutputFilename = filename;
-                                                decryptStart();
-                                            }
-
-                                            public void onCancelClick() {
-                                                removeDialog(Id.dialog.output_filename);
-                                            }
-                                        },
-                                        getString(R.string.filemanager_titleSave),
-                                        getString(R.string.filemanager_btnSave),
-                                        null,
-                                        Id.request.output_filename);
-            }
+        case Id.dialog.output_filename: {
+            return FileDialog.build(this, getString(R.string.title_decryptToFile),
+                    getString(R.string.specifyFileToDecryptTo), mOutputFilename,
+                    new FileDialog.OnClickListener() {
+                        public void onOkClick(String filename, boolean checked) {
+                            removeDialog(Id.dialog.output_filename);
+                            mOutputFilename = filename;
+                            decryptStart();
+                        }
 
-            case Id.dialog.lookup_unknown_key: {
-                AlertDialog.Builder alert = new AlertDialog.Builder(this);
-
-                alert.setIcon(android.R.drawable.ic_dialog_alert);
-                alert.setTitle(R.string.title_unknownSignatureKey);
-                alert.setMessage(getString(R.string.lookupUnknownKey, Apg.getSmallFingerPrint(mUnknownSignatureKeyId)));
-
-                alert.setPositiveButton(android.R.string.ok,
-                                        new DialogInterface.OnClickListener() {
-                                            public void onClick(DialogInterface dialog, int id) {
-                                                removeDialog(Id.dialog.lookup_unknown_key);
-                                                Intent intent = new Intent(DecryptActivity.this,
-                                                                           KeyServerQueryActivity.class);
-                                                intent.setAction(Apg.Intent.LOOK_UP_KEY_ID);
-                                                intent.putExtra(Apg.EXTRA_KEY_ID, mUnknownSignatureKeyId);
-                                                startActivityForResult(intent, Id.request.look_up_key_id);
-                                            }
-                                        });
-                alert.setNegativeButton(android.R.string.cancel,
-                                        new DialogInterface.OnClickListener() {
-                                            public void onClick(DialogInterface dialog, int id) {
-                                                removeDialog(Id.dialog.lookup_unknown_key);
-                                                PausableThread thread = getRunningThread();
-                                                if (thread != null && thread.isPaused()) {
-                                                    thread.unpause();
-                                                }
-                                            }
-                                        });
-                alert.setCancelable(true);
-
-                return alert.create();
-            }
+                        public void onCancelClick() {
+                            removeDialog(Id.dialog.output_filename);
+                        }
+                    }, getString(R.string.filemanager_titleSave),
+                    getString(R.string.filemanager_btnSave), null, Id.request.output_filename);
+        }
 
-            default: {
-                break;
-            }
+        case Id.dialog.lookup_unknown_key: {
+            AlertDialog.Builder alert = new AlertDialog.Builder(this);
+
+            alert.setIcon(android.R.drawable.ic_dialog_alert);
+            alert.setTitle(R.string.title_unknownSignatureKey);
+            alert.setMessage(getString(R.string.lookupUnknownKey,
+                    Apg.getSmallFingerPrint(mUnknownSignatureKeyId)));
+
+            alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int id) {
+                    removeDialog(Id.dialog.lookup_unknown_key);
+                    Intent intent = new Intent(DecryptActivity.this, KeyServerQueryActivity.class);
+                    intent.setAction(Apg.Intent.LOOK_UP_KEY_ID);
+                    intent.putExtra(Apg.EXTRA_KEY_ID, mUnknownSignatureKeyId);
+                    startActivityForResult(intent, Id.request.look_up_key_id);
+                }
+            });
+            alert.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int id) {
+                    removeDialog(Id.dialog.lookup_unknown_key);
+                    PausableThread thread = getRunningThread();
+                    if (thread != null && thread.isPaused()) {
+                        thread.unpause();
+                    }
+                }
+            });
+            alert.setCancelable(true);
+
+            return alert.create();
+        }
+
+        default: {
+            break;
+        }
         }
 
         return super.onCreateDialog(id);
diff --git a/src/org/thialfihar/android/apg/EncryptActivity.java b/src/org/thialfihar/android/apg/EncryptActivity.java
index a138d3376..1ac98dfd3 100644
--- a/src/org/thialfihar/android/apg/EncryptActivity.java
+++ b/src/org/thialfihar/android/apg/EncryptActivity.java
@@ -23,6 +23,7 @@ import org.spongycastle.openpgp.PGPSecretKey;
 import org.spongycastle.openpgp.PGPSecretKeyRing;
 import org.thialfihar.android.apg.provider.DataProvider;
 import org.thialfihar.android.apg.utils.Choice;
+import org.thialfihar.android.apg.utils.Compatibility;
 
 import android.app.Dialog;
 import android.content.ActivityNotFoundException;
@@ -30,7 +31,6 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Message;
-import android.text.ClipboardManager;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.animation.AnimationUtils;
@@ -881,8 +881,7 @@ public class EncryptActivity extends BaseActivity {
         switch (mEncryptTarget) {
             case Id.target.clipboard: {
                 String message = data.getString(Apg.EXTRA_ENCRYPTED_MESSAGE);
-                ClipboardManager clip = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-                clip.setText(message);
+                Compatibility.copyToClipboard(this, message);
                 Toast.makeText(this, R.string.encryptionToClipboardSuccessful,
                                Toast.LENGTH_SHORT).show();
                 break;
diff --git a/src/org/thialfihar/android/apg/KeyListActivity.java b/src/org/thialfihar/android/apg/KeyListActivity.java
index 51b731833..cbf2f93c0 100644
--- a/src/org/thialfihar/android/apg/KeyListActivity.java
+++ b/src/org/thialfihar/android/apg/KeyListActivity.java
@@ -23,9 +23,6 @@ import org.thialfihar.android.apg.provider.KeyRings;
 import org.thialfihar.android.apg.provider.Keys;
 import org.thialfihar.android.apg.provider.UserIds;
 
-import com.google.zxing.integration.android.IntentIntegrator;
-import com.google.zxing.integration.android.IntentResult;
-
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.SearchManager;
@@ -143,19 +140,19 @@ public class KeyListActivity extends BaseActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case Id.menu.option.import_keys: {
-                showDialog(Id.dialog.import_keys);
-                return true;
-            }
+        case Id.menu.option.import_keys: {
+            showDialog(Id.dialog.import_keys);
+            return true;
+        }
 
-            case Id.menu.option.export_keys: {
-                showDialog(Id.dialog.export_keys);
-                return true;
-            }
-            
-            default: {
-                return super.onOptionsItemSelected(item);
-            }
+        case Id.menu.option.export_keys: {
+            showDialog(Id.dialog.export_keys);
+            return true;
+        }
+
+        default: {
+            return super.onOptionsItemSelected(item);
+        }
         }
     }
 
@@ -170,21 +167,21 @@ public class KeyListActivity extends BaseActivity {
         }
 
         switch (menuItem.getItemId()) {
-            case Id.menu.export: {
-                mSelectedItem = groupPosition;
-                showDialog(Id.dialog.export_key);
-                return true;
-            }
+        case Id.menu.export: {
+            mSelectedItem = groupPosition;
+            showDialog(Id.dialog.export_key);
+            return true;
+        }
 
-            case Id.menu.delete: {
-                mSelectedItem = groupPosition;
-                showDialog(Id.dialog.delete_key);
-                return true;
-            }
+        case Id.menu.delete: {
+            mSelectedItem = groupPosition;
+            showDialog(Id.dialog.delete_key);
+            return true;
+        }
 
-            default: {
-                return super.onContextItemSelected(menuItem);
-            }
+        default: {
+            return super.onContextItemSelected(menuItem);
+        }
         }
     }
 
@@ -193,101 +190,94 @@ public class KeyListActivity extends BaseActivity {
         boolean singleKeyExport = false;
 
         switch (id) {
-            case Id.dialog.delete_key: {
-                final int keyRingId = mListAdapter.getKeyRingId(mSelectedItem);
-                mSelectedItem = -1;
-                // TODO: better way to do this?
-                String userId = "<unknown>";
-                Object keyRing = Apg.getKeyRing(keyRingId);
-                if (keyRing != null) {
-                    if (keyRing instanceof PGPPublicKeyRing) {
-                        userId = Apg.getMainUserIdSafe(this, Apg.getMasterKey((PGPPublicKeyRing) keyRing));
-                    } else {
-                        userId = Apg.getMainUserIdSafe(this, Apg.getMasterKey((PGPSecretKeyRing) keyRing));
-                    }
+        case Id.dialog.delete_key: {
+            final int keyRingId = mListAdapter.getKeyRingId(mSelectedItem);
+            mSelectedItem = -1;
+            // TODO: better way to do this?
+            String userId = "<unknown>";
+            Object keyRing = Apg.getKeyRing(keyRingId);
+            if (keyRing != null) {
+                if (keyRing instanceof PGPPublicKeyRing) {
+                    userId = Apg.getMainUserIdSafe(this,
+                            Apg.getMasterKey((PGPPublicKeyRing) keyRing));
+                } else {
+                    userId = Apg.getMainUserIdSafe(this,
+                            Apg.getMasterKey((PGPSecretKeyRing) keyRing));
                 }
-
-                AlertDialog.Builder builder = new AlertDialog.Builder(this);
-                builder.setTitle(R.string.warning);
-                builder.setMessage(getString(mKeyType == Id.type.public_key ?
-                                                 R.string.keyDeletionConfirmation :
-                                                 R.string.secretKeyDeletionConfirmation, userId));
-                builder.setIcon(android.R.drawable.ic_dialog_alert);
-                builder.setPositiveButton(R.string.btn_delete,
-                                          new DialogInterface.OnClickListener() {
-                                              public void onClick(DialogInterface dialog, int id) {
-                                                  deleteKey(keyRingId);
-                                                  removeDialog(Id.dialog.delete_key);
-                                              }
-                                          });
-                builder.setNegativeButton(android.R.string.cancel,
-                                          new DialogInterface.OnClickListener() {
-                                              public void onClick(DialogInterface dialog, int id) {
-                                                  removeDialog(Id.dialog.delete_key);
-                                              }
-                                          });
-                return builder.create();
             }
 
-            case Id.dialog.import_keys: {
-                return FileDialog.build(this, getString(R.string.title_importKeys),
-                                        getString(R.string.specifyFileToImportFrom),
-                                        mImportFilename,
-                                        new FileDialog.OnClickListener() {
-                                            public void onOkClick(String filename, boolean checked) {
-                                                removeDialog(Id.dialog.import_keys);
-                                                mDeleteAfterImport = checked;
-                                                mImportFilename = filename;
-                                                importKeys();
-                                            }
-
-                                            public void onCancelClick() {
-                                                removeDialog(Id.dialog.import_keys);
-                                            }
-                                        },
-                                        getString(R.string.filemanager_titleOpen),
-                                        getString(R.string.filemanager_btnOpen),
-                                        getString(R.string.label_deleteAfterImport),
-                                        Id.request.filename);
-            }
+            AlertDialog.Builder builder = new AlertDialog.Builder(this);
+            builder.setTitle(R.string.warning);
+            builder.setMessage(getString(
+                    mKeyType == Id.type.public_key ? R.string.keyDeletionConfirmation
+                            : R.string.secretKeyDeletionConfirmation, userId));
+            builder.setIcon(android.R.drawable.ic_dialog_alert);
+            builder.setPositiveButton(R.string.btn_delete, new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int id) {
+                    deleteKey(keyRingId);
+                    removeDialog(Id.dialog.delete_key);
+                }
+            });
+            builder.setNegativeButton(android.R.string.cancel,
+                    new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int id) {
+                            removeDialog(Id.dialog.delete_key);
+                        }
+                    });
+            return builder.create();
+        }
 
-            case Id.dialog.export_key: {
-                singleKeyExport = true;
-                // break intentionally omitted, to use the Id.dialog.export_keys dialog
-            }
+        case Id.dialog.import_keys: {
+            return FileDialog.build(this, getString(R.string.title_importKeys),
+                    getString(R.string.specifyFileToImportFrom), mImportFilename,
+                    new FileDialog.OnClickListener() {
+                        public void onOkClick(String filename, boolean checked) {
+                            removeDialog(Id.dialog.import_keys);
+                            mDeleteAfterImport = checked;
+                            mImportFilename = filename;
+                            importKeys();
+                        }
 
-            case Id.dialog.export_keys: {
-                String title = (singleKeyExport ?
-                                    getString(R.string.title_exportKey) :
-                                    getString(R.string.title_exportKeys));
-
-                final int thisDialogId = (singleKeyExport ? Id.dialog.export_key : Id.dialog.export_keys);
-
-                return FileDialog.build(this, title,
-                                        getString(mKeyType == Id.type.public_key ?
-                                                      R.string.specifyFileToExportTo :
-                                                      R.string.specifyFileToExportSecretKeysTo),
-                                        mExportFilename,
-                                        new FileDialog.OnClickListener() {
-                                            public void onOkClick(String filename, boolean checked) {
-                                                removeDialog(thisDialogId);
-                                                mExportFilename = filename;
-                                                exportKeys();
-                                            }
-
-                                            public void onCancelClick() {
-                                                removeDialog(thisDialogId);
-                                            }
-                                        },
-                                        getString(R.string.filemanager_titleSave),
-                                        getString(R.string.filemanager_btnSave),
-                                        null,
-                                        Id.request.filename);
-            }
+                        public void onCancelClick() {
+                            removeDialog(Id.dialog.import_keys);
+                        }
+                    }, getString(R.string.filemanager_titleOpen),
+                    getString(R.string.filemanager_btnOpen),
+                    getString(R.string.label_deleteAfterImport), Id.request.filename);
+        }
 
-            default: {
-                return super.onCreateDialog(id);
-            }
+        case Id.dialog.export_key: {
+            singleKeyExport = true;
+            // break intentionally omitted, to use the Id.dialog.export_keys dialog
+        }
+
+        case Id.dialog.export_keys: {
+            String title = (singleKeyExport ? getString(R.string.title_exportKey)
+                    : getString(R.string.title_exportKeys));
+
+            final int thisDialogId = (singleKeyExport ? Id.dialog.export_key
+                    : Id.dialog.export_keys);
+
+            return FileDialog.build(this, title,
+                    getString(mKeyType == Id.type.public_key ? R.string.specifyFileToExportTo
+                            : R.string.specifyFileToExportSecretKeysTo), mExportFilename,
+                    new FileDialog.OnClickListener() {
+                        public void onOkClick(String filename, boolean checked) {
+                            removeDialog(thisDialogId);
+                            mExportFilename = filename;
+                            exportKeys();
+                        }
+
+                        public void onCancelClick() {
+                            removeDialog(thisDialogId);
+                        }
+                    }, getString(R.string.filemanager_titleSave),
+                    getString(R.string.filemanager_btnSave), null, Id.request.filename);
+        }
+
+        default: {
+            return super.onCreateDialog(id);
+        }
         }
     }
 
@@ -328,13 +318,14 @@ public class KeyListActivity extends BaseActivity {
             }
 
             if (mTask == Id.task.import_keys) {
-                data = Apg.importKeyRings(this, mKeyType, new InputData(importInputStream, size), this);
+                data = Apg.importKeyRings(this, mKeyType, new InputData(importInputStream, size),
+                        this);
             } else {
                 Vector<Integer> keyRingIds = new Vector<Integer>();
                 if (mSelectedItem == -1) {
-                    keyRingIds = Apg.getKeyRingIds(mKeyType == Id.type.public_key ?
-                                                       Id.database.type_public :
-                                                       Id.database.type_secret);
+                    keyRingIds = Apg
+                            .getKeyRingIds(mKeyType == Id.type.public_key ? Id.database.type_public
+                                    : Id.database.type_secret);
                 } else {
                     int keyRingId = mListAdapter.getKeyRingId(mSelectedItem);
                     keyRingIds.add(keyRingId);
@@ -386,82 +377,78 @@ public class KeyListActivity extends BaseActivity {
         if (data != null) {
             int type = data.getInt(Constants.extras.status);
             switch (type) {
-                case Id.message.import_done: {
-                    removeDialog(Id.dialog.importing);
-
-                    String error = data.getString(Apg.EXTRA_ERROR);
-                    if (error != null) {
-                        Toast.makeText(KeyListActivity.this,
-                                       getString(R.string.errorMessage, error),
-                                       Toast.LENGTH_SHORT).show();
+            case Id.message.import_done: {
+                removeDialog(Id.dialog.importing);
+
+                String error = data.getString(Apg.EXTRA_ERROR);
+                if (error != null) {
+                    Toast.makeText(KeyListActivity.this, getString(R.string.errorMessage, error),
+                            Toast.LENGTH_SHORT).show();
+                } else {
+                    int added = data.getInt("added");
+                    int updated = data.getInt("updated");
+                    int bad = data.getInt("bad");
+                    String message;
+                    if (added > 0 && updated > 0) {
+                        message = getString(R.string.keysAddedAndUpdated, added, updated);
+                    } else if (added > 0) {
+                        message = getString(R.string.keysAdded, added);
+                    } else if (updated > 0) {
+                        message = getString(R.string.keysUpdated, updated);
                     } else {
-                        int added = data.getInt("added");
-                        int updated = data.getInt("updated");
-                        int bad = data.getInt("bad");
-                        String message;
-                        if (added > 0 && updated > 0) {
-                            message = getString(R.string.keysAddedAndUpdated, added, updated);
-                        } else if (added > 0) {
-                            message = getString(R.string.keysAdded, added);
-                        } else if (updated > 0) {
-                            message = getString(R.string.keysUpdated, updated);
-                        } else {
-                            message = getString(R.string.noKeysAddedOrUpdated);
-                        }
-                        Toast.makeText(KeyListActivity.this, message,
-                                       Toast.LENGTH_SHORT).show();
-                        if (bad > 0) {
-                            AlertDialog.Builder alert = new AlertDialog.Builder(this);
-
-                            alert.setIcon(android.R.drawable.ic_dialog_alert);
-                            alert.setTitle(R.string.warning);
-                            alert.setMessage(this.getString(R.string.badKeysEncountered, bad));
-
-                            alert.setPositiveButton(android.R.string.ok,
-                                    new DialogInterface.OnClickListener() {
-                                        public void onClick(DialogInterface dialog, int id) {
-                                            dialog.cancel();
-                                        }
-                                    });
-                            alert.setCancelable(true);
-                            alert.create().show();
-                        } else if (mDeleteAfterImport) {
-                            // everything went well, so now delete, if that was turned on
-                            setDeleteFile(mImportFilename);
-                            showDialog(Id.dialog.delete_file);
-                        }
+                        message = getString(R.string.noKeysAddedOrUpdated);
+                    }
+                    Toast.makeText(KeyListActivity.this, message, Toast.LENGTH_SHORT).show();
+                    if (bad > 0) {
+                        AlertDialog.Builder alert = new AlertDialog.Builder(this);
+
+                        alert.setIcon(android.R.drawable.ic_dialog_alert);
+                        alert.setTitle(R.string.warning);
+                        alert.setMessage(this.getString(R.string.badKeysEncountered, bad));
+
+                        alert.setPositiveButton(android.R.string.ok,
+                                new DialogInterface.OnClickListener() {
+                                    public void onClick(DialogInterface dialog, int id) {
+                                        dialog.cancel();
+                                    }
+                                });
+                        alert.setCancelable(true);
+                        alert.create().show();
+                    } else if (mDeleteAfterImport) {
+                        // everything went well, so now delete, if that was turned on
+                        setDeleteFile(mImportFilename);
+                        showDialog(Id.dialog.delete_file);
                     }
-                    refreshList();
-                    break;
                 }
+                refreshList();
+                break;
+            }
 
-                case Id.message.export_done: {
-                    removeDialog(Id.dialog.exporting);
+            case Id.message.export_done: {
+                removeDialog(Id.dialog.exporting);
 
-                    String error = data.getString(Apg.EXTRA_ERROR);
-                    if (error != null) {
-                        Toast.makeText(KeyListActivity.this,
-                                       getString(R.string.errorMessage, error),
-                                       Toast.LENGTH_SHORT).show();
+                String error = data.getString(Apg.EXTRA_ERROR);
+                if (error != null) {
+                    Toast.makeText(KeyListActivity.this, getString(R.string.errorMessage, error),
+                            Toast.LENGTH_SHORT).show();
+                } else {
+                    int exported = data.getInt("exported");
+                    String message;
+                    if (exported == 1) {
+                        message = getString(R.string.keyExported);
+                    } else if (exported > 0) {
+                        message = getString(R.string.keysExported, exported);
                     } else {
-                        int exported = data.getInt("exported");
-                        String message;
-                        if (exported == 1) {
-                            message = getString(R.string.keyExported);
-                        } else if (exported > 0) {
-                            message = getString(R.string.keysExported, exported);
-                        } else{
-                            message = getString(R.string.noKeysExported);
-                        }
-                        Toast.makeText(KeyListActivity.this, message,
-                                       Toast.LENGTH_SHORT).show();
+                        message = getString(R.string.noKeysExported);
                     }
-                    break;
+                    Toast.makeText(KeyListActivity.this, message, Toast.LENGTH_SHORT).show();
                 }
+                break;
+            }
 
-                default: {
-                    break;
-                }
+            default: {
+                break;
+            }
             }
         }
     }
@@ -489,7 +476,7 @@ public class KeyListActivity extends BaseActivity {
             public String fingerPrint;
 
             public KeyChild(long keyId, boolean isMasterKey, int algorithm, int keySize,
-                            boolean canSign, boolean canEncrypt) {
+                    boolean canSign, boolean canEncrypt) {
                 this.type = KEY;
                 this.keyId = keyId;
                 this.isMasterKey = isMasterKey;
@@ -516,22 +503,19 @@ public class KeyListActivity extends BaseActivity {
             mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             mDatabase = Apg.getDatabase().db();
             SQLiteQueryBuilder qb = new SQLiteQueryBuilder();
-            qb.setTables(KeyRings.TABLE_NAME + " INNER JOIN " + Keys.TABLE_NAME + " ON " +
-                                          "(" + KeyRings.TABLE_NAME + "." + KeyRings._ID + " = " +
-                                          Keys.TABLE_NAME + "." + Keys.KEY_RING_ID + " AND " +
-                                          Keys.TABLE_NAME + "." + Keys.IS_MASTER_KEY + " = '1'" +
-                                          ") " +
-                                          " INNER JOIN " + UserIds.TABLE_NAME + " ON " +
-                                          "(" + Keys.TABLE_NAME + "." + Keys._ID + " = " +
-                                          UserIds.TABLE_NAME + "." + UserIds.KEY_ID + " AND " +
-                                          UserIds.TABLE_NAME + "." + UserIds.RANK + " = '0')");
+            qb.setTables(KeyRings.TABLE_NAME + " INNER JOIN " + Keys.TABLE_NAME + " ON " + "("
+                    + KeyRings.TABLE_NAME + "." + KeyRings._ID + " = " + Keys.TABLE_NAME + "."
+                    + Keys.KEY_RING_ID + " AND " + Keys.TABLE_NAME + "." + Keys.IS_MASTER_KEY
+                    + " = '1'" + ") " + " INNER JOIN " + UserIds.TABLE_NAME + " ON " + "("
+                    + Keys.TABLE_NAME + "." + Keys._ID + " = " + UserIds.TABLE_NAME + "."
+                    + UserIds.KEY_ID + " AND " + UserIds.TABLE_NAME + "." + UserIds.RANK
+                    + " = '0')");
 
             if (searchString != null && searchString.trim().length() > 0) {
                 String[] chunks = searchString.trim().split(" +");
-                qb.appendWhere("EXISTS (SELECT tmp." + UserIds._ID + " FROM " +
-                                        UserIds.TABLE_NAME + " AS tmp WHERE " +
-                                        "tmp." + UserIds.KEY_ID + " = " +
-                                        Keys.TABLE_NAME + "." + Keys._ID);
+                qb.appendWhere("EXISTS (SELECT tmp." + UserIds._ID + " FROM " + UserIds.TABLE_NAME
+                        + " AS tmp WHERE " + "tmp." + UserIds.KEY_ID + " = " + Keys.TABLE_NAME
+                        + "." + Keys._ID);
                 for (int i = 0; i < chunks.length; ++i) {
                     qb.appendWhere(" AND tmp." + UserIds.USER_ID + " LIKE ");
                     qb.appendWhereEscapeString("%" + chunks[i] + "%");
@@ -539,32 +523,22 @@ public class KeyListActivity extends BaseActivity {
                 qb.appendWhere(")");
             }
 
-            mCursor = qb.query(mDatabase,
-                    new String[] {
-                        KeyRings.TABLE_NAME + "." + KeyRings._ID,           // 0
-                        KeyRings.TABLE_NAME + "." + KeyRings.MASTER_KEY_ID, // 1
-                        UserIds.TABLE_NAME + "." + UserIds.USER_ID,         // 2
-                    },
-                    KeyRings.TABLE_NAME + "." + KeyRings.TYPE + " = ?",
-                    new String[] { "" + (mKeyType == Id.type.public_key ?
-                                             Id.database.type_public : Id.database.type_secret) },
-                    null, null, UserIds.TABLE_NAME + "." + UserIds.USER_ID + " ASC");
+            mCursor = qb.query(mDatabase, new String[] { KeyRings.TABLE_NAME + "." + KeyRings._ID, // 0
+                    KeyRings.TABLE_NAME + "." + KeyRings.MASTER_KEY_ID, // 1
+                    UserIds.TABLE_NAME + "." + UserIds.USER_ID, // 2
+            }, KeyRings.TABLE_NAME + "." + KeyRings.TYPE + " = ?", new String[] { ""
+                    + (mKeyType == Id.type.public_key ? Id.database.type_public
+                            : Id.database.type_secret) }, null, null, UserIds.TABLE_NAME + "."
+                    + UserIds.USER_ID + " ASC");
 
             // content provider way for reference, might have to go back to it sometime:
-            /*Uri contentUri = null;
-            if (mKeyType == Id.type.secret_key) {
-                contentUri = Apg.CONTENT_URI_SECRET_KEY_RINGS;
-            } else {
-                contentUri = Apg.CONTENT_URI_PUBLIC_KEY_RINGS;
-            }
-            mCursor = getContentResolver().query(
-                    contentUri,
-                    new String[] {
-                        DataProvider._ID,           // 0
-                        DataProvider.MASTER_KEY_ID, // 1
-                        DataProvider.USER_ID,       // 2
-                    },
-                    null, null, null);*/
+            /*
+             * Uri contentUri = null; if (mKeyType == Id.type.secret_key) { contentUri =
+             * Apg.CONTENT_URI_SECRET_KEY_RINGS; } else { contentUri =
+             * Apg.CONTENT_URI_PUBLIC_KEY_RINGS; } mCursor = getContentResolver().query( contentUri,
+             * new String[] { DataProvider._ID, // 0 DataProvider.MASTER_KEY_ID, // 1
+             * DataProvider.USER_ID, // 2 }, null, null, null);
+             */
 
             startManagingCursor(mCursor);
             rebuild(false);
@@ -595,26 +569,22 @@ public class KeyListActivity extends BaseActivity {
 
             mCursor.moveToPosition(groupPosition);
             children = new Vector<KeyChild>();
-            Cursor c = mDatabase.query(Keys.TABLE_NAME,
-                    new String[] {
-                        Keys._ID,           // 0
-                        Keys.KEY_ID,        // 1
-                        Keys.IS_MASTER_KEY, // 2
-                        Keys.ALGORITHM,     // 3
-                        Keys.KEY_SIZE,      // 4
-                        Keys.CAN_SIGN,      // 5
-                        Keys.CAN_ENCRYPT,   // 6
-                    },
-                    Keys.KEY_RING_ID + " = ?",
-                    new String[] { mCursor.getString(0) },
-                    null, null, Keys.RANK + " ASC");
+            Cursor c = mDatabase.query(Keys.TABLE_NAME, new String[] { Keys._ID, // 0
+                    Keys.KEY_ID, // 1
+                    Keys.IS_MASTER_KEY, // 2
+                    Keys.ALGORITHM, // 3
+                    Keys.KEY_SIZE, // 4
+                    Keys.CAN_SIGN, // 5
+                    Keys.CAN_ENCRYPT, // 6
+            }, Keys.KEY_RING_ID + " = ?", new String[] { mCursor.getString(0) }, null, null,
+                    Keys.RANK + " ASC");
 
             int masterKeyId = -1;
             long fingerPrintId = -1;
             for (int i = 0; i < c.getCount(); ++i) {
                 c.moveToPosition(i);
                 children.add(new KeyChild(c.getLong(1), c.getInt(2) == 1, c.getInt(3), c.getInt(4),
-                                          c.getInt(5) == 1, c.getInt(6) == 1));
+                        c.getInt(5) == 1, c.getInt(6) == 1));
                 if (i == 0) {
                     masterKeyId = c.getInt(0);
                     fingerPrintId = c.getLong(1);
@@ -624,19 +594,15 @@ public class KeyListActivity extends BaseActivity {
 
             if (masterKeyId != -1) {
                 children.insertElementAt(new KeyChild(Apg.getFingerPrint(fingerPrintId), true), 0);
-                c = mDatabase.query(UserIds.TABLE_NAME,
-                         new String[] {
-                             UserIds.USER_ID, // 0
-                         },
-                         UserIds.KEY_ID + " = ? AND " + UserIds.RANK + " > 0",
-                         new String[] { "" + masterKeyId },
-                         null, null, UserIds.RANK + " ASC");
-
-                 for (int i = 0; i < c.getCount(); ++i) {
-                     c.moveToPosition(i);
-                     children.add(new KeyChild(c.getString(0)));
-                 }
-                 c.close();
+                c = mDatabase.query(UserIds.TABLE_NAME, new String[] { UserIds.USER_ID, // 0
+                        }, UserIds.KEY_ID + " = ? AND " + UserIds.RANK + " > 0", new String[] { ""
+                                + masterKeyId }, null, null, UserIds.RANK + " ASC");
+
+                for (int i = 0; i < c.getCount(); ++i) {
+                    c.moveToPosition(i);
+                    children.add(new KeyChild(c.getString(0)));
+                }
+                c.close();
             }
 
             mChildren.set(groupPosition, children);
@@ -682,7 +648,7 @@ public class KeyListActivity extends BaseActivity {
         }
 
         public View getGroupView(int groupPosition, boolean isExpanded, View convertView,
-                                 ViewGroup parent) {
+                ViewGroup parent) {
             mCursor.moveToPosition(groupPosition);
 
             View view = mInflater.inflate(R.layout.key_list_group_item, null);
@@ -713,9 +679,8 @@ public class KeyListActivity extends BaseActivity {
             return view;
         }
 
-        public View getChildView(int groupPosition, int childPosition,
-                                 boolean isLastChild, View convertView,
-                                 ViewGroup parent) {
+        public View getChildView(int groupPosition, int childPosition, boolean isLastChild,
+                View convertView, ViewGroup parent) {
             mCursor.moveToPosition(groupPosition);
 
             Vector<KeyChild> children = getChildrenOfGroup(groupPosition);
@@ -723,46 +688,46 @@ public class KeyListActivity extends BaseActivity {
             KeyChild child = children.get(childPosition);
             View view = null;
             switch (child.type) {
-                case KeyChild.KEY: {
-                    if (child.isMasterKey) {
-                        view = mInflater.inflate(R.layout.key_list_child_item_master_key, null);
-                    } else {
-                        view = mInflater.inflate(R.layout.key_list_child_item_sub_key, null);
-                    }
-
-                    TextView keyId = (TextView) view.findViewById(R.id.keyId);
-                    String keyIdStr = Apg.getSmallFingerPrint(child.keyId);
-                    keyId.setText(keyIdStr);
-                    TextView keyDetails = (TextView) view.findViewById(R.id.keyDetails);
-                    String algorithmStr = Apg.getAlgorithmInfo(child.algorithm, child.keySize);
-                    keyDetails.setText("(" + algorithmStr + ")");
+            case KeyChild.KEY: {
+                if (child.isMasterKey) {
+                    view = mInflater.inflate(R.layout.key_list_child_item_master_key, null);
+                } else {
+                    view = mInflater.inflate(R.layout.key_list_child_item_sub_key, null);
+                }
 
-                    ImageView encryptIcon = (ImageView) view.findViewById(R.id.ic_encryptKey);
-                    if (!child.canEncrypt) {
-                        encryptIcon.setVisibility(View.GONE);
-                    }
+                TextView keyId = (TextView) view.findViewById(R.id.keyId);
+                String keyIdStr = Apg.getSmallFingerPrint(child.keyId);
+                keyId.setText(keyIdStr);
+                TextView keyDetails = (TextView) view.findViewById(R.id.keyDetails);
+                String algorithmStr = Apg.getAlgorithmInfo(child.algorithm, child.keySize);
+                keyDetails.setText("(" + algorithmStr + ")");
 
-                    ImageView signIcon = (ImageView) view.findViewById(R.id.ic_signKey);
-                    if (!child.canSign) {
-                        signIcon.setVisibility(View.GONE);
-                    }
-                    break;
+                ImageView encryptIcon = (ImageView) view.findViewById(R.id.ic_encryptKey);
+                if (!child.canEncrypt) {
+                    encryptIcon.setVisibility(View.GONE);
                 }
 
-                case KeyChild.USER_ID: {
-                    view = mInflater.inflate(R.layout.key_list_child_item_user_id, null);
-                    TextView userId = (TextView) view.findViewById(R.id.userId);
-                    userId.setText(child.userId);
-                    break;
+                ImageView signIcon = (ImageView) view.findViewById(R.id.ic_signKey);
+                if (!child.canSign) {
+                    signIcon.setVisibility(View.GONE);
                 }
+                break;
+            }
 
-                case KeyChild.FINGER_PRINT: {
-                    view = mInflater.inflate(R.layout.key_list_child_item_user_id, null);
-                    TextView userId = (TextView) view.findViewById(R.id.userId);
-                    userId.setText(getString(R.string.fingerprint) + ":\n" +
-                                   child.fingerPrint.replace("  ", "\n"));
-                    break;
-                }
+            case KeyChild.USER_ID: {
+                view = mInflater.inflate(R.layout.key_list_child_item_user_id, null);
+                TextView userId = (TextView) view.findViewById(R.id.userId);
+                userId.setText(child.userId);
+                break;
+            }
+
+            case KeyChild.FINGER_PRINT: {
+                view = mInflater.inflate(R.layout.key_list_child_item_user_id, null);
+                TextView userId = (TextView) view.findViewById(R.id.userId);
+                userId.setText(getString(R.string.fingerprint) + ":\n"
+                        + child.fingerPrint.replace("  ", "\n"));
+                break;
+            }
             }
             return view;
         }
@@ -771,26 +736,26 @@ public class KeyListActivity extends BaseActivity {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
-            case Id.request.filename: {
-                if (resultCode == RESULT_OK && data != null) {
-                    String filename = data.getDataString();
-                    if (filename != null) {
-                        // Get rid of URI prefix:
-                        if (filename.startsWith("file://")) {
-                            filename = filename.substring(7);
-                        }
-                        // replace %20 and so on
-                        filename = Uri.decode(filename);
-
-                        FileDialog.setFilename(filename);
+        case Id.request.filename: {
+            if (resultCode == RESULT_OK && data != null) {
+                String filename = data.getDataString();
+                if (filename != null) {
+                    // Get rid of URI prefix:
+                    if (filename.startsWith("file://")) {
+                        filename = filename.substring(7);
                     }
+                    // replace %20 and so on
+                    filename = Uri.decode(filename);
+
+                    FileDialog.setFilename(filename);
                 }
-                return;
-            }
-            
-            default: {
-                break;
             }
+            return;
+        }
+
+        default: {
+            break;
+        }
         }
         super.onActivityResult(requestCode, resultCode, data);
     }
diff --git a/src/org/thialfihar/android/apg/PublicKeyListActivity.java b/src/org/thialfihar/android/apg/PublicKeyListActivity.java
index 1290c9df6..5bcc97db5 100644
--- a/src/org/thialfihar/android/apg/PublicKeyListActivity.java
+++ b/src/org/thialfihar/android/apg/PublicKeyListActivity.java
@@ -18,9 +18,6 @@ package org.thialfihar.android.apg;
 
 import org.spongycastle.openpgp.PGPPublicKeyRing;
 
-import com.google.zxing.integration.android.IntentIntegrator;
-import com.google.zxing.integration.android.IntentResult;
-
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.ContextMenu;
@@ -41,26 +38,25 @@ public class PublicKeyListActivity extends KeyListActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        menu.add(0, Id.menu.option.import_keys, 0, R.string.menu_importKeys)
-                .setIcon(android.R.drawable.ic_menu_add);
-        menu.add(0, Id.menu.option.export_keys, 1, R.string.menu_exportKeys)
-                .setIcon(android.R.drawable.ic_menu_save);
-        menu.add(1, Id.menu.option.search, 2, R.string.menu_search)
-                .setIcon(android.R.drawable.ic_menu_search);
-        menu.add(1, Id.menu.option.preferences, 3, R.string.menu_preferences)
-                .setIcon(android.R.drawable.ic_menu_preferences);
-        menu.add(1, Id.menu.option.about, 4, R.string.menu_about)
-                .setIcon(android.R.drawable.ic_menu_info_details);
-        menu.add(1, Id.menu.option.scanQRCode, 5, R.string.menu_scanQRCode)
-                .setIcon(android.R.drawable.ic_menu_add);
+        menu.add(0, Id.menu.option.import_keys, 0, R.string.menu_importKeys).setIcon(
+                android.R.drawable.ic_menu_add);
+        menu.add(0, Id.menu.option.export_keys, 1, R.string.menu_exportKeys).setIcon(
+                android.R.drawable.ic_menu_save);
+        menu.add(1, Id.menu.option.search, 2, R.string.menu_search).setIcon(
+                android.R.drawable.ic_menu_search);
+        menu.add(1, Id.menu.option.preferences, 3, R.string.menu_preferences).setIcon(
+                android.R.drawable.ic_menu_preferences);
+        menu.add(1, Id.menu.option.about, 4, R.string.menu_about).setIcon(
+                android.R.drawable.ic_menu_info_details);
+        menu.add(1, Id.menu.option.scanQRCode, 5, R.string.menu_scanQRCode).setIcon(
+                android.R.drawable.ic_menu_add);
         return true;
     }
 
     @Override
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
         super.onCreateContextMenu(menu, v, menuInfo);
-        ExpandableListView.ExpandableListContextMenuInfo info =
-                (ExpandableListView.ExpandableListContextMenuInfo) menuInfo;
+        ExpandableListView.ExpandableListContextMenuInfo info = (ExpandableListView.ExpandableListContextMenuInfo) menuInfo;
         int type = ExpandableListView.getPackedPositionType(info.packedPosition);
 
         if (type == ExpandableListView.PACKED_POSITION_TYPE_GROUP) {
@@ -84,103 +80,103 @@ public class PublicKeyListActivity extends KeyListActivity {
         }
 
         switch (menuItem.getItemId()) {
-            case Id.menu.update: {
-                mSelectedItem = groupPosition;
-                final int keyRingId = mListAdapter.getKeyRingId(groupPosition);
-                long keyId = 0;
-                Object keyRing = Apg.getKeyRing(keyRingId);
-                if (keyRing != null && keyRing instanceof PGPPublicKeyRing) {
-                    keyId = Apg.getMasterKey((PGPPublicKeyRing) keyRing).getKeyID();
-                }
-                if (keyId == 0) {
-                    // this shouldn't happen
-                    return true;
-                }
-
-                Intent intent = new Intent(this, KeyServerQueryActivity.class);
-                intent.setAction(Apg.Intent.LOOK_UP_KEY_ID_AND_RETURN);
-                intent.putExtra(Apg.EXTRA_KEY_ID, keyId);
-                startActivityForResult(intent, Id.request.look_up_key_id);
-                
+        case Id.menu.update: {
+            mSelectedItem = groupPosition;
+            final int keyRingId = mListAdapter.getKeyRingId(groupPosition);
+            long keyId = 0;
+            Object keyRing = Apg.getKeyRing(keyRingId);
+            if (keyRing != null && keyRing instanceof PGPPublicKeyRing) {
+                keyId = Apg.getMasterKey((PGPPublicKeyRing) keyRing).getKeyID();
+            }
+            if (keyId == 0) {
+                // this shouldn't happen
                 return true;
             }
 
-            case Id.menu.exportToServer: {
-                mSelectedItem = groupPosition;
-                final int keyRingId = mListAdapter.getKeyRingId(groupPosition);
-                
-                Intent intent = new Intent(this, SendKeyActivity.class);
-                intent.setAction(Apg.Intent.EXPORT_KEY_TO_SERVER);
-                intent.putExtra(Apg.EXTRA_KEY_ID, keyRingId);
-                startActivityForResult(intent, Id.request.export_to_server);
-                
-                return true;
+            Intent intent = new Intent(this, KeyServerQueryActivity.class);
+            intent.setAction(Apg.Intent.LOOK_UP_KEY_ID_AND_RETURN);
+            intent.putExtra(Apg.EXTRA_KEY_ID, keyId);
+            startActivityForResult(intent, Id.request.look_up_key_id);
+
+            return true;
+        }
+
+        case Id.menu.exportToServer: {
+            mSelectedItem = groupPosition;
+            final int keyRingId = mListAdapter.getKeyRingId(groupPosition);
+
+            Intent intent = new Intent(this, SendKeyActivity.class);
+            intent.setAction(Apg.Intent.EXPORT_KEY_TO_SERVER);
+            intent.putExtra(Apg.EXTRA_KEY_ID, keyRingId);
+            startActivityForResult(intent, Id.request.export_to_server);
+
+            return true;
+        }
+
+        case Id.menu.signKey: {
+            mSelectedItem = groupPosition;
+            final int keyRingId = mListAdapter.getKeyRingId(groupPosition);
+            long keyId = 0;
+            Object keyRing = Apg.getKeyRing(keyRingId);
+            if (keyRing != null && keyRing instanceof PGPPublicKeyRing) {
+                keyId = Apg.getMasterKey((PGPPublicKeyRing) keyRing).getKeyID();
             }
-            
-            case Id.menu.signKey: {
-                mSelectedItem = groupPosition;
-                final int keyRingId = mListAdapter.getKeyRingId(groupPosition);
-                long keyId = 0;
-                Object keyRing = Apg.getKeyRing(keyRingId);
-                if (keyRing != null && keyRing instanceof PGPPublicKeyRing) {
-                    keyId = Apg.getMasterKey((PGPPublicKeyRing) keyRing).getKeyID();
-                }
-                
-                if (keyId == 0) {
-                    // this shouldn't happen
-                    return true;
-                }
-                
-                Intent intent = new Intent(this, SignKeyActivity.class);
-                intent.putExtra(Apg.EXTRA_KEY_ID, keyId);
-                startActivity(intent);
-                
+
+            if (keyId == 0) {
+                // this shouldn't happen
                 return true;
             }
-            
-            default: {
-                return super.onContextItemSelected(menuItem);
-            }
+
+            Intent intent = new Intent(this, SignKeyActivity.class);
+            intent.putExtra(Apg.EXTRA_KEY_ID, keyId);
+            startActivity(intent);
+
+            return true;
+        }
+
+        default: {
+            return super.onContextItemSelected(menuItem);
+        }
         }
     }
-    
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case Id.menu.option.scanQRCode: {
-                Intent intent = new Intent(this, ImportFromQRCodeActivity.class);
-                intent.setAction(Apg.Intent.IMPORT_FROM_QR_CODE);
-                startActivityForResult(intent, Id.request.import_from_qr_code);
+        case Id.menu.option.scanQRCode: {
+            Intent intent = new Intent(this, ImportFromQRCodeActivity.class);
+            intent.setAction(Apg.Intent.IMPORT_FROM_QR_CODE);
+            startActivityForResult(intent, Id.request.import_from_qr_code);
 
-                return true;
-            }
+            return true;
+        }
 
-            default: {
-                return super.onOptionsItemSelected(item);
-            }
+        default: {
+            return super.onOptionsItemSelected(item);
+        }
         }
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
-            case Id.request.look_up_key_id: {
-                if (resultCode == RESULT_CANCELED || data == null ||
-                    data.getStringExtra(Apg.EXTRA_TEXT) == null) {
-                    return;
-                }
-
-                Intent intent = new Intent(this, PublicKeyListActivity.class);
-                intent.setAction(Apg.Intent.IMPORT);
-                intent.putExtra(Apg.EXTRA_TEXT, data.getStringExtra(Apg.EXTRA_TEXT));
-                handleIntent(intent);
-                break;
-            }
-            
-            default: {
-                super.onActivityResult(requestCode, resultCode, data);
-                break;
+        case Id.request.look_up_key_id: {
+            if (resultCode == RESULT_CANCELED || data == null
+                    || data.getStringExtra(Apg.EXTRA_TEXT) == null) {
+                return;
             }
+
+            Intent intent = new Intent(this, PublicKeyListActivity.class);
+            intent.setAction(Apg.Intent.IMPORT);
+            intent.putExtra(Apg.EXTRA_TEXT, data.getStringExtra(Apg.EXTRA_TEXT));
+            handleIntent(intent);
+            break;
+        }
+
+        default: {
+            super.onActivityResult(requestCode, resultCode, data);
+            break;
+        }
         }
     }
 }
diff --git a/src/org/thialfihar/android/apg/utils/Compatibility.java b/src/org/thialfihar/android/apg/utils/Compatibility.java
new file mode 100644
index 000000000..1a1a44020
--- /dev/null
+++ b/src/org/thialfihar/android/apg/utils/Compatibility.java
@@ -0,0 +1,79 @@
+package org.thialfihar.android.apg.utils;
+
+import java.lang.reflect.Method;
+
+import android.content.Context;
+import android.util.Log;
+
+public class Compatibility {
+
+    private static final String clipboardLabel = "APG";
+
+    /**
+     * Wrapper around ClipboardManager based on Android version using Reflection API, from
+     * http://www.projectsexception.com/blog/?p=87
+     * 
+     * @param context
+     * @param text
+     */
+    public static void copyToClipboard(Context context, String text) {
+        Object clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE);
+        try {
+            if ("android.text.ClipboardManager".equals(clipboard.getClass().getName())) {
+                Method method = clipboard.getClass().getMethod("setText", CharSequence.class);
+                method.invoke(clipboard, text);
+            } else if ("android.content.ClipboardManager".equals(clipboard.getClass().getName())) {
+                Class<?> clazz = Class.forName("android.content.ClipData");
+                Method method = clazz.getMethod("newPlainText", CharSequence.class,
+                        CharSequence.class);
+                Object clip = method.invoke(null, clipboardLabel, text);
+                method = clipboard.getClass().getMethod("setPrimaryClip", clazz);
+                method.invoke(clipboard, clip);
+            }
+        } catch (Exception e) {
+            Log.e("ProjectsException", "There was and error copying the text to the clipboard: "
+                    + e.getMessage());
+        }
+    }
+
+    /**
+     * Wrapper around ClipboardManager based on Android version using Reflection API
+     * 
+     * @param context
+     * @param text
+     */
+    public static CharSequence getClipboardText(Context context) {
+        Object clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE);
+        try {
+            if ("android.text.ClipboardManager".equals(clipboard.getClass().getName())) {
+                // CharSequence text = clipboard.getText();
+                Method method = clipboard.getClass().getMethod("getText");
+                Object text = method.invoke(clipboard);
+
+                return (CharSequence) text;
+            } else if ("android.content.ClipboardManager".equals(clipboard.getClass().getName())) {
+                // ClipData clipData = clipboard.getPrimaryClip();
+                Method methodGetPrimaryClip = clipboard.getClass().getMethod("getPrimaryClip");
+                Object clipData = methodGetPrimaryClip.invoke(clipboard);
+
+                // ClipData.Item clipDataItem = clipData.getItemAt(0);
+                Method methodGetItemAt = clipData.getClass().getMethod("getItemAt", Integer.TYPE);
+                Object clipDataItem = methodGetItemAt.invoke(clipData, 0);
+
+                // CharSequence text = clipDataItem.coerceToText(context);
+                Method methodGetString = clipDataItem.getClass().getMethod("coerceToText",
+                        Context.class);
+                Object text = methodGetString.invoke(clipDataItem, context);
+
+                return (CharSequence) text;
+            } else {
+                return null;
+            }
+        } catch (Exception e) {
+            Log.e("ProjectsException", "There was and error getting the text from the clipboard: "
+                    + e.getMessage());
+
+            return null;
+        }
+    }
+}