From 7a98ffc90a34a381a68c5b485183373ed307320a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 27 Aug 2015 12:34:54 +0200
Subject: [PATCH] Remove dead code

---
 OpenKeychain/src/main/AndroidManifest.xml     |   1 -
 .../KeybaseVerificationOperation.java         |   4 +-
 ...fy.java => PgpDecryptVerifyOperation.java} |   4 +-
 .../keychain/remote/OpenPgpService.java       |   4 +-
 .../keychain/service/KeychainService.java     |   4 +-
 .../ui/CertifyFingerprintFragment.java        |  11 +-
 .../keychain/ui/PassphraseDialogActivity.java |  69 +--
 .../keychain/ui/PassphraseWizardActivity.java | 577 ------------------
 .../keychain/pgp/PgpEncryptDecryptTest.java   |  34 +-
 9 files changed, 59 insertions(+), 649 deletions(-)
 rename OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/{PgpDecryptVerify.java => PgpDecryptVerifyOperation.java} (99%)
 delete mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseWizardActivity.java

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 0bc2e87ec..f8708722a 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -691,7 +691,6 @@
         <activity
             android:name=".ui.OrbotRequiredDialogActivity"
             android:theme="@android:style/Theme.NoDisplay" />
-        <activity android:name=".ui.PassphraseWizardActivity" />
         <!--
         NOTE: singleTop is set to get NFC foreground dispatch to work.
               Then, all NFC intents will be broadcasted to onNewIntent() of this activity!
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/KeybaseVerificationOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/KeybaseVerificationOperation.java
index 30f37dd4f..8f1abde83 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/KeybaseVerificationOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/KeybaseVerificationOperation.java
@@ -43,7 +43,7 @@ import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult;
 import org.sufficientlysecure.keychain.operations.results.KeybaseVerificationResult;
 import org.sufficientlysecure.keychain.operations.results.OperationResult;
-import org.sufficientlysecure.keychain.pgp.PgpDecryptVerify;
+import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyOperation;
 import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyInputParcel;
 import org.sufficientlysecure.keychain.pgp.Progressable;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
@@ -141,7 +141,7 @@ public class KeybaseVerificationOperation extends BaseOperation<KeybaseVerificat
                 }
             }
 
-            PgpDecryptVerify op = new PgpDecryptVerify(mContext, mProviderHelper, mProgressable);
+            PgpDecryptVerifyOperation op = new PgpDecryptVerifyOperation(mContext, mProviderHelper, mProgressable);
 
             PgpDecryptVerifyInputParcel input = new PgpDecryptVerifyInputParcel(messageBytes)
                     .setSignedLiteralData(true)
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java
similarity index 99%
rename from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java
index 1e51403fc..dd30156f9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java
@@ -79,9 +79,9 @@ import java.security.SignatureException;
 import java.util.Date;
 import java.util.Iterator;
 
-public class PgpDecryptVerify extends BaseOperation<PgpDecryptVerifyInputParcel> {
+public class PgpDecryptVerifyOperation extends BaseOperation<PgpDecryptVerifyInputParcel> {
 
-    public PgpDecryptVerify(Context context, ProviderHelper providerHelper, Progressable progressable) {
+    public PgpDecryptVerifyOperation(Context context, ProviderHelper providerHelper, Progressable progressable) {
         super(context, providerHelper, progressable);
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
index 9e6681341..49079f585 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
@@ -38,7 +38,7 @@ import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult;
 import org.sufficientlysecure.keychain.operations.results.OperationResult.LogEntryParcel;
 import org.sufficientlysecure.keychain.operations.results.PgpSignEncryptResult;
 import org.sufficientlysecure.keychain.pgp.PgpSecurityConstants;
-import org.sufficientlysecure.keychain.pgp.PgpDecryptVerify;
+import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyOperation;
 import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyInputParcel;
 import org.sufficientlysecure.keychain.pgp.PgpSignEncryptInputParcel;
 import org.sufficientlysecure.keychain.pgp.PgpSignEncryptOperation;
@@ -533,7 +533,7 @@ public class OpenPgpService extends RemoteService {
 
             byte[] detachedSignature = data.getByteArrayExtra(OpenPgpApi.EXTRA_DETACHED_SIGNATURE);
 
-            PgpDecryptVerify op = new PgpDecryptVerify(this, mProviderHelper, null);
+            PgpDecryptVerifyOperation op = new PgpDecryptVerifyOperation(this, mProviderHelper, null);
 
             long inputLength = inputStream.available();
             InputData inputData = new InputData(inputStream, inputLength);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java
index dca2a08c2..eff27f112 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java
@@ -40,7 +40,7 @@ import org.sufficientlysecure.keychain.operations.PromoteKeyOperation;
 import org.sufficientlysecure.keychain.operations.RevokeOperation;
 import org.sufficientlysecure.keychain.operations.SignEncryptOperation;
 import org.sufficientlysecure.keychain.operations.results.OperationResult;
-import org.sufficientlysecure.keychain.pgp.PgpDecryptVerify;
+import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyOperation;
 import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyInputParcel;
 import org.sufficientlysecure.keychain.pgp.Progressable;
 import org.sufficientlysecure.keychain.pgp.SignEncryptParcel;
@@ -111,7 +111,7 @@ public class KeychainService extends Service implements Progressable {
                     op = new SignEncryptOperation(outerThis, new ProviderHelper(outerThis),
                             outerThis, mActionCanceled);
                 } else if (inputParcel instanceof PgpDecryptVerifyInputParcel) {
-                    op = new PgpDecryptVerify(outerThis, new ProviderHelper(outerThis), outerThis);
+                    op = new PgpDecryptVerifyOperation(outerThis, new ProviderHelper(outerThis), outerThis);
                 } else if (inputParcel instanceof SaveKeyringParcel) {
                     op = new EditKeyOperation(outerThis, new ProviderHelper(outerThis), outerThis,
                             mActionCanceled);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintFragment.java
index a6b8a0e85..7a9df1576 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintFragment.java
@@ -51,9 +51,6 @@ public class CertifyFingerprintFragment extends LoaderFragment implements
 
     private Uri mDataUri;
 
-    private View mActionNo;
-    private View mActionYes;
-
     /**
      * Creates new instance of this fragment
      */
@@ -72,18 +69,18 @@ public class CertifyFingerprintFragment extends LoaderFragment implements
         View root = super.onCreateView(inflater, superContainer, savedInstanceState);
         View view = inflater.inflate(R.layout.certify_fingerprint_fragment, getContainer());
 
-        mActionNo = view.findViewById(R.id.certify_fingerprint_button_no);
-        mActionYes = view.findViewById(R.id.certify_fingerprint_button_yes);
+        View actionNo = view.findViewById(R.id.certify_fingerprint_button_no);
+        View actionYes = view.findViewById(R.id.certify_fingerprint_button_yes);
 
         mFingerprint = (TextView) view.findViewById(R.id.certify_fingerprint_fingerprint);
 
-        mActionNo.setOnClickListener(new View.OnClickListener() {
+        actionNo.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 getActivity().finish();
             }
         });
-        mActionYes.setOnClickListener(new View.OnClickListener() {
+        actionYes.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 certify(mDataUri);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
index d7224bd04..881fb05aa 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
@@ -280,51 +280,42 @@ public class PassphraseDialogActivity extends FragmentActivity {
 
             mPassphraseText.setText(message);
 
-            if (keyType == CanonicalizedSecretKey.SecretKeyType.PATTERN) {
-                // start pattern dialog and show progress circle here...
-//                Intent patternActivity = new Intent(getActivity(), LockPatternActivity.class);
-//                patternActivity.putExtra(LockPatternActivity.EXTRA_PATTERN, "123");
-//                startActivityForResult(patternActivity, REQUEST_CODE_ENTER_PATTERN);
-                mInput.setVisibility(View.INVISIBLE);
-                mProgress.setVisibility(View.VISIBLE);
-            } else {
-                // Hack to open keyboard.
-                // This is the only method that I found to work across all Android versions
-                // http://turbomanage.wordpress.com/2012/05/02/show-soft-keyboard-automatically-when-edittext-receives-focus/
-                // Notes: * onCreateView can't be used because we want to add buttons to the dialog
-                //        * opening in onActivityCreated does not work on Android 4.4
-                mPassphraseEditText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-                    @Override
-                    public void onFocusChange(View v, boolean hasFocus) {
-                        mPassphraseEditText.post(new Runnable() {
-                            @Override
-                            public void run() {
-                                if (getActivity() == null || mPassphraseEditText == null) {
-                                    return;
-                                }
-                                InputMethodManager imm = (InputMethodManager) getActivity()
-                                        .getSystemService(Context.INPUT_METHOD_SERVICE);
-                                imm.showSoftInput(mPassphraseEditText, InputMethodManager.SHOW_IMPLICIT);
+            // Hack to open keyboard.
+            // This is the only method that I found to work across all Android versions
+            // http://turbomanage.wordpress.com/2012/05/02/show-soft-keyboard-automatically-when-edittext-receives-focus/
+            // Notes: * onCreateView can't be used because we want to add buttons to the dialog
+            //        * opening in onActivityCreated does not work on Android 4.4
+            mPassphraseEditText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+                @Override
+                public void onFocusChange(View v, boolean hasFocus) {
+                    mPassphraseEditText.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (getActivity() == null || mPassphraseEditText == null) {
+                                return;
                             }
-                        });
-                    }
-                });
-                mPassphraseEditText.requestFocus();
-
-                mPassphraseEditText.setImeActionLabel(getString(android.R.string.ok), EditorInfo.IME_ACTION_DONE);
-                mPassphraseEditText.setOnEditorActionListener(this);
-
-                if ((keyType == CanonicalizedSecretKey.SecretKeyType.DIVERT_TO_CARD && Preferences.getPreferences(activity).useNumKeypadForYubiKeyPin())
-                        || keyType == CanonicalizedSecretKey.SecretKeyType.PIN) {
-                    mPassphraseEditText.setInputType(InputType.TYPE_CLASS_NUMBER);
-                    mPassphraseEditText.setTransformationMethod(PasswordTransformationMethod.getInstance());
-                } else {
-                    mPassphraseEditText.setRawInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+                            InputMethodManager imm = (InputMethodManager) getActivity()
+                                    .getSystemService(Context.INPUT_METHOD_SERVICE);
+                            imm.showSoftInput(mPassphraseEditText, InputMethodManager.SHOW_IMPLICIT);
+                        }
+                    });
                 }
+            });
+            mPassphraseEditText.requestFocus();
 
+            mPassphraseEditText.setImeActionLabel(getString(android.R.string.ok), EditorInfo.IME_ACTION_DONE);
+            mPassphraseEditText.setOnEditorActionListener(this);
+
+            if ((keyType == CanonicalizedSecretKey.SecretKeyType.DIVERT_TO_CARD && Preferences.getPreferences(activity).useNumKeypadForYubiKeyPin())
+                    || keyType == CanonicalizedSecretKey.SecretKeyType.PIN) {
+                mPassphraseEditText.setInputType(InputType.TYPE_CLASS_NUMBER);
                 mPassphraseEditText.setTransformationMethod(PasswordTransformationMethod.getInstance());
+            } else {
+                mPassphraseEditText.setRawInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
             }
 
+            mPassphraseEditText.setTransformationMethod(PasswordTransformationMethod.getInstance());
+
             AlertDialog dialog = alert.create();
             dialog.setButton(DialogInterface.BUTTON_POSITIVE,
                     activity.getString(R.string.btn_unlock), (DialogInterface.OnClickListener) null);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseWizardActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseWizardActivity.java
deleted file mode 100644
index e55494145..000000000
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseWizardActivity.java
+++ /dev/null
@@ -1,577 +0,0 @@
-/*
- * Copyright (C) 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;
-
-import android.annotation.TargetApi;
-import android.support.v7.app.AlertDialog;
-import android.app.PendingIntent;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.nfc.FormatException;
-import android.nfc.NdefMessage;
-import android.nfc.NdefRecord;
-import android.nfc.NfcAdapter;
-import android.nfc.Tag;
-import android.nfc.tech.Ndef;
-import android.os.Build;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentTransaction;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.util.Log;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.SecureRandom;
-import java.util.Arrays;
-import java.util.List;
-
-@TargetApi(Build.VERSION_CODES.HONEYCOMB)
-public class PassphraseWizardActivity extends FragmentActivity {
-//public class PassphraseWizardActivity extends FragmentActivity implements LockPatternView.OnPatternListener {
-    //create or authenticate
-    public String selectedAction;
-    //for lockpattern
-    public static char[] pattern;
-    private static String passphrase = "";
-    //nfc string
-    private static byte[] output = new byte[8];
-
-    public static final String CREATE_METHOD = "create";
-    public static final String AUTHENTICATION = "authenticate";
-
-    NfcAdapter adapter;
-    PendingIntent pendingIntent;
-    IntentFilter writeTagFilters[];
-    boolean writeMode;
-    Tag myTag;
-    boolean writeNFC = false;
-    boolean readNFC = false;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getActionBar() != null) {
-            getActionBar().setTitle(R.string.unlock_method);
-        }
-
-        selectedAction = getIntent().getAction();
-        if (savedInstanceState == null) {
-            SelectMethods selectMethods = new SelectMethods();
-            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-            transaction.add(R.id.fragmentContainer, selectMethods).commit();
-        }
-        setContentView(R.layout.passphrase_wizard);
-
-        adapter = NfcAdapter.getDefaultAdapter(this);
-        if (adapter != null) {
-            pendingIntent = PendingIntent.getActivity(this, 0, new Intent(this, PassphraseWizardActivity.class).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), 0);
-            IntentFilter tagDetected = new IntentFilter(NfcAdapter.ACTION_TAG_DISCOVERED);
-            tagDetected.addCategory(Intent.CATEGORY_DEFAULT);
-            writeTagFilters = new IntentFilter[]{tagDetected};
-        }
-    }
-
-    public void noPassphrase(View view) {
-        passphrase = "";
-        Toast.makeText(this, R.string.no_passphrase_set, Toast.LENGTH_SHORT).show();
-        this.finish();
-    }
-
-    public void passphrase(View view) {
-        Passphrase passphrase = new Passphrase();
-        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-        transaction.replace(R.id.fragmentContainer, passphrase).addToBackStack(null).commit();
-    }
-
-    public void startLockpattern(View view) {
-        if (getActionBar() != null) {
-            getActionBar().setTitle(R.string.draw_lockpattern);
-        }
-//        LockPatternFragmentOld lpf = LockPatternFragmentOld.newInstance(selectedAction);
-//        LockPatternFragment lpf = LockPatternFragment.newInstance("asd");
-
-//        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-//        transaction.replace(R.id.fragmentContainer, lpf).addToBackStack(null).commit();
-    }
-
-    public void cancel(View view) {
-        this.finish();
-    }
-
-    public void savePassphrase(View view) {
-        EditText passphrase = (EditText) findViewById(R.id.passphrase);
-        passphrase.setError(null);
-        String pw = passphrase.getText().toString();
-        //check and save passphrase
-        if (selectedAction.equals(CREATE_METHOD)) {
-            EditText passphraseAgain = (EditText) findViewById(R.id.passphraseAgain);
-            passphraseAgain.setError(null);
-            String pwAgain = passphraseAgain.getText().toString();
-
-            if (!TextUtils.isEmpty(pw)) {
-                if (!TextUtils.isEmpty(pwAgain)) {
-                    if (pw.equals(pwAgain)) {
-                        PassphraseWizardActivity.passphrase = pw;
-                        Toast.makeText(this, getString(R.string.passphrase_saved), Toast.LENGTH_SHORT).show();
-                        this.finish();
-                    } else {
-                        passphrase.setError(getString(R.string.passphrase_invalid));
-                        passphrase.requestFocus();
-                    }
-                } else {
-                    passphraseAgain.setError(getString(R.string.missing_passphrase));
-                    passphraseAgain.requestFocus();
-                }
-            } else {
-                passphrase.setError(getString(R.string.missing_passphrase));
-                passphrase.requestFocus();
-            }
-        }
-        //check for right passphrase
-        if (selectedAction.equals(AUTHENTICATION)) {
-            if (pw.equals(PassphraseWizardActivity.passphrase)) {
-                Toast.makeText(this, getString(R.string.unlocked), Toast.LENGTH_SHORT).show();
-                this.finish();
-            } else {
-                passphrase.setError(getString(R.string.passphrase_invalid));
-                passphrase.requestFocus();
-            }
-        }
-    }
-
-    public void NFC(View view) {
-        if (adapter != null) {
-            if (getActionBar() != null) {
-                getActionBar().setTitle(R.string.nfc_title);
-            }
-            NFCFragment nfc = new NFCFragment();
-            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-            transaction.replace(R.id.fragmentContainer, nfc).addToBackStack(null).commit();
-
-            //if you want to create a new method or just authenticate
-            if (CREATE_METHOD.equals(selectedAction)) {
-                writeNFC = true;
-            } else if (AUTHENTICATION.equals(selectedAction)) {
-                readNFC = true;
-            }
-
-            if (!adapter.isEnabled()) {
-                showAlertDialog(getString(R.string.enable_nfc), true);
-            }
-        } else {
-            showAlertDialog(getString(R.string.no_nfc_support), false);
-        }
-    }
-
-    @Override
-    protected void onNewIntent(Intent intent) {
-        if (NfcAdapter.ACTION_TAG_DISCOVERED.equals(intent.getAction())) {
-            myTag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
-
-            if (writeNFC && CREATE_METHOD.equals(selectedAction)) {
-                //write new password on NFC tag
-                try {
-                    if (myTag != null) {
-                        write(myTag);
-                        writeNFC = false;   //just write once
-                        Toast.makeText(this, R.string.nfc_write_succesful, Toast.LENGTH_SHORT).show();
-                        //advance to lockpattern
-//                        LockPatternFragmentOld lpf = LockPatternFragmentOld.newInstance(selectedAction);
-//                        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-//                        transaction.replace(R.id.fragmentContainer, lpf).addToBackStack(null).commit();
-                    }
-                } catch (IOException | FormatException e) {
-                    Log.e(Constants.TAG, "Failed to write on NFC tag", e);
-                }
-
-            } else if (readNFC && AUTHENTICATION.equals(selectedAction)) {
-                //read pw from NFC tag
-                try {
-                    if (myTag != null) {
-                        //if tag detected, read tag
-                        String pwtag = read(myTag);
-                        if (output != null && pwtag.equals(output.toString())) {
-
-                            //passwort matches, go to next view
-                            Toast.makeText(this, R.string.passphrases_match + "!", Toast.LENGTH_SHORT).show();
-
-//                            LockPatternFragmentOld lpf = LockPatternFragmentOld.newInstance(selectedAction);
-//                            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-//                            transaction.replace(R.id.fragmentContainer, lpf).addToBackStack(null).commit();
-                            readNFC = false;    //just once
-                        } else {
-                            //passwort doesnt match
-                            TextView nfc = (TextView) findViewById(R.id.nfcText);
-                            nfc.setText(R.string.nfc_wrong_tag);
-                        }
-                    }
-                } catch (IOException | FormatException e) {
-                    Log.e(Constants.TAG, "Failed to read NFC tag", e);
-                }
-            }
-        }
-    }
-
-    private void write(Tag tag) throws IOException, FormatException {
-        //generate new random key and write them on the tag
-        SecureRandom sr = new SecureRandom();
-        sr.nextBytes(output);
-        NdefRecord[] records = {createRecord(output.toString())};
-        NdefMessage message = new NdefMessage(records);
-        Ndef ndef = Ndef.get(tag);
-        ndef.connect();
-        ndef.writeNdefMessage(message);
-        ndef.close();
-    }
-
-    private String read(Tag tag) throws IOException, FormatException {
-        //read string from tag
-        String password = null;
-        Ndef ndef = Ndef.get(tag);
-        ndef.connect();
-        NdefMessage ndefMessage = ndef.getCachedNdefMessage();
-
-        NdefRecord[] records = ndefMessage.getRecords();
-        for (NdefRecord ndefRecord : records) {
-            if (ndefRecord.getTnf() == NdefRecord.TNF_WELL_KNOWN && Arrays.equals(ndefRecord.getType(), NdefRecord.RTD_TEXT)) {
-                try {
-                    password = readText(ndefRecord);
-                } catch (UnsupportedEncodingException e) {
-                    Log.e(Constants.TAG, "Failed to read password from tag", e);
-                }
-            }
-        }
-        ndef.close();
-        return password;
-    }
-
-    private String readText(NdefRecord record) throws UnsupportedEncodingException {
-        //low-level method for reading nfc
-        byte[] payload = record.getPayload();
-        String textEncoding = ((payload[0] & 128) == 0) ? "UTF-8" : "UTF-16";
-        int languageCodeLength = payload[0] & 0063;
-        return new String(payload, languageCodeLength + 1, payload.length - languageCodeLength - 1, textEncoding);
-    }
-
-    private NdefRecord createRecord(String text) throws UnsupportedEncodingException {
-        //low-level method for writing nfc
-        String lang = "en";
-        byte[] textBytes = text.getBytes();
-        byte[] langBytes = lang.getBytes("US-ASCII");
-        int langLength = langBytes.length;
-        int textLength = textBytes.length;
-        byte[] payload = new byte[1 + langLength + textLength];
-
-        // set status byte (see NDEF spec for actual bits)
-        payload[0] = (byte) langLength;
-        // copy langbytes and textbytes into payload
-        System.arraycopy(langBytes, 0, payload, 1, langLength);
-        System.arraycopy(textBytes, 0, payload, 1 + langLength, textLength);
-        return new NdefRecord(NdefRecord.TNF_WELL_KNOWN, NdefRecord.RTD_TEXT, new byte[0], payload);
-    }
-
-    public void showAlertDialog(String message, boolean nfc) {
-        //This method shows an AlertDialog
-        AlertDialog.Builder alert = new AlertDialog.Builder(this);
-        alert.setTitle("Information").setMessage(message).setPositiveButton("Ok",
-                new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialogInterface, int i) {
-                    }
-                }
-        );
-        if (nfc) {
-
-            alert.setNeutralButton(R.string.nfc_settings,
-                    new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialogInterface, int i) {
-                            startActivity(new Intent(Settings.ACTION_NFC_SETTINGS));
-                        }
-                    }
-            );
-        }
-        alert.show();
-    }
-
-    @Override
-    public void onPause() {
-        //pause this app and free nfc intent
-        super.onPause();
-        if (adapter != null) {
-            WriteModeOff();
-        }
-    }
-
-    @Override
-    public void onResume() {
-        //resume this app and get nfc intent
-        super.onResume();
-        if (adapter != null) {
-            WriteModeOn();
-        }
-    }
-
-    private void WriteModeOn() {
-        //enable nfc for this view
-        writeMode = true;
-        adapter.enableForegroundDispatch(this, pendingIntent, writeTagFilters, null);
-    }
-
-    private void WriteModeOff() {
-        //disable nfc for this view
-        writeMode = false;
-        adapter.disableForegroundDispatch(this);
-    }
-
-    public static class SelectMethods extends Fragment {
-//        private OnFragmentInteractionListener mListener;
-
-        /**
-         * Use this factory method to create a new instance of
-         * this fragment using the provided parameters.
-         */
-        public SelectMethods() {
-
-        }
-
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-        }
-
-        @Override
-        public void onResume() {
-            super.onResume();
-            if (getActivity().getActionBar() != null) {
-                getActivity().getActionBar().setTitle(R.string.unlock_method);
-            }
-        }
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                                 Bundle savedInstanceState) {
-            // Inflate the layout for this fragment
-            return inflater.inflate(R.layout.passphrase_wizard_fragment_select_methods, container, false);
-        }
-
-//        @Override
-//        public void onAttach(Activity activity) {
-//            super.onAttach(activity);
-//            try {
-//                mListener = (OnFragmentInteractionListener) activity;
-//            } catch (ClassCastException e) {
-//                throw new ClassCastException(activity.toString()
-//                        + " must implement OnFragmentInteractionListener");
-//            }
-//        }
-//
-//        @Override
-//        public void onDetach() {
-//            super.onDetach();
-//            mListener = null;
-//        }
-
-        /**
-         * This interface must be implemented by activities that contain this
-         * fragment to allow an interaction in this fragment to be communicated
-         * to the activity and potentially other fragments contained in that
-         * activity.
-         * <p/>
-         * See the Android Training lesson <a href=
-         * "http://developer.android.com/training/basics/fragments/communicating.html"
-         * >Communicating with Other Fragments</a> for more information.
-         */
-//        public static interface OnFragmentInteractionListener {
-//            public void onFragmentInteraction(Uri uri);
-//        }
-
-    }
-
-
-    //    /**
-//     * A simple {@link android.support.v4.app.Fragment} subclass.
-//     * Activities that contain this fragment must implement the
-//     * {@link com.haibison.android.lockpattern.Passphrase.OnFragmentInteractionListener} interface
-//     * to handle interaction events.
-//     */
-    public static class Passphrase extends Fragment {
-
-//        private OnFragmentInteractionListener mListener;
-
-        public Passphrase() {
-        }
-
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-        }
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                                 Bundle savedInstanceState) {
-            // Inflate the layout for this fragment
-            View view = inflater.inflate(R.layout.passphrase_wizard_fragment_passphrase, container, false);
-            EditText passphraseAgain = (EditText) view.findViewById(R.id.passphraseAgain);
-            TextView passphraseText = (TextView) view.findViewById(R.id.passphraseText);
-            TextView passphraseTextAgain = (TextView) view.findViewById(R.id.passphraseTextAgain);
-            String selectedAction = getActivity().getIntent().getAction();
-            if (selectedAction.equals(AUTHENTICATION)) {
-                passphraseAgain.setVisibility(View.GONE);
-                passphraseTextAgain.setVisibility(View.GONE);
-                passphraseText.setText(R.string.enter_passphrase);
-//                getActivity().getActionBar().setTitle(R.string.enter_passphrase);
-            } else if (selectedAction.equals(CREATE_METHOD)) {
-                passphraseAgain.setVisibility(View.VISIBLE);
-                passphraseTextAgain.setVisibility(View.VISIBLE);
-                passphraseText.setText(R.string.passphrase);
-//                getActivity().getActionBar().setTitle(R.string.set_passphrase);
-            }
-            return view;
-        }
-
-//        @Override
-//        public void onAttach(Activity activity) {
-//            super.onAttach(activity);
-//            try {
-//                mListener = (OnFragmentInteractionListener) activity;
-//            } catch (ClassCastException e) {
-//                throw new ClassCastException(activity.toString()
-//                        + " must implement OnFragmentInteractionListener");
-//            }
-//        }
-//
-//        @Override
-//        public void onDetach() {
-//            super.onDetach();
-//            mListener = null;
-//        }
-
-//        /**
-//         * This interface must be implemented by activities that contain this
-//         * fragment to allow an interaction in this fragment to be communicated
-//         * to the activity and potentially other fragments contained in that
-//         * activity.
-//         * <p/>
-//         * See the Android Training lesson <a href=
-//         * "http://developer.android.com/training/basics/fragments/communicating.html"
-//         * >Communicating with Other Fragments</a> for more information.
-//         */
-//        public interface OnFragmentInteractionListener {
-//            public void onFragmentInteraction(Uri uri);
-//        }
-    }
-
-
-    /**
-     * A simple {@link android.support.v4.app.Fragment} subclass.
-     * Activities that contain this fragment must implement the
-     * interface
-     * to handle interaction events.
-     * Use the  method to
-     * create an instance of this fragment.
-     */
-    public static class NFCFragment extends Fragment {
-        // TODO: Rename parameter arguments, choose names that match
-        // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-        private static final String ARG_PARAM1 = "param1";
-        private static final String ARG_PARAM2 = "param2";
-
-        // TODO: Rename and change types of parameters
-        private String mParam1;
-        private String mParam2;
-
-//        private OnFragmentInteractionListener mListener;
-
-        /**
-         * Use this factory method to create a new instance of
-         * this fragment using the provided parameters.
-         *
-         * @param param1 Parameter 1.
-         * @param param2 Parameter 2.
-         * @return A new instance of fragment SelectMethods.
-         */
-        // TODO: Rename and change types and number of parameters
-        public static NFCFragment newInstance(String param1, String param2) {
-            NFCFragment fragment = new NFCFragment();
-            Bundle args = new Bundle();
-            args.putString(ARG_PARAM1, param1);
-            args.putString(ARG_PARAM2, param2);
-            fragment.setArguments(args);
-            return fragment;
-        }
-
-        public NFCFragment() {
-            // Required empty public constructor
-        }
-
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            if (getArguments() != null) {
-                mParam1 = getArguments().getString(ARG_PARAM1);
-                mParam2 = getArguments().getString(ARG_PARAM2);
-            }
-        }
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                                 Bundle savedInstanceState) {
-            // Inflate the layout for this fragment
-            return inflater.inflate(R.layout.passphrase_wizard_fragment_nfc, container, false);
-        }
-
-//        // TODO: Rename method, update argument and hook method into UI event
-//        public void onButtonPressed(Uri uri) {
-//            if (mListener != null) {
-//                mListener.onFragmentInteraction(uri);
-//            }
-//        }
-
-//        @Override
-//        public void onAttach(Activity activity) {
-//            super.onAttach(activity);
-//            try {
-//                mListener = (OnFragmentInteractionListener) activity;
-//            } catch (ClassCastException e) {
-//                throw new ClassCastException(activity.toString()
-//                        + " must implement OnFragmentInteractionListener");
-//            }
-//        }
-
-
-//        @Override
-//        public void onDetach() {
-//            super.onDetach();
-//            mListener = null;
-//        }
-    }
-
-}
diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java
index cd6f115ec..041b660c2 100644
--- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java
+++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java
@@ -196,7 +196,7 @@ public class PgpEncryptDecryptTest {
             ByteArrayInputStream in = new ByteArrayInputStream(ciphertext);
             InputData data = new InputData(in, in.available());
 
-            PgpDecryptVerify op = new PgpDecryptVerify(RuntimeEnvironment.application,
+            PgpDecryptVerifyOperation op = new PgpDecryptVerifyOperation(RuntimeEnvironment.application,
                     new ProviderHelper(RuntimeEnvironment.application), null);
             PgpDecryptVerifyInputParcel input = new PgpDecryptVerifyInputParcel();
             input.setAllowSymmetricDecryption(true);
@@ -226,7 +226,7 @@ public class PgpEncryptDecryptTest {
             ByteArrayInputStream in = new ByteArrayInputStream(ciphertext);
             InputData data = new InputData(in, in.available());
 
-            PgpDecryptVerify op = new PgpDecryptVerify(RuntimeEnvironment.application,
+            PgpDecryptVerifyOperation op = new PgpDecryptVerifyOperation(RuntimeEnvironment.application,
                     new ProviderHelper(RuntimeEnvironment.application), null);
             PgpDecryptVerifyInputParcel input = new PgpDecryptVerifyInputParcel();
             input.setAllowSymmetricDecryption(true);
@@ -248,7 +248,7 @@ public class PgpEncryptDecryptTest {
             ByteArrayInputStream in = new ByteArrayInputStream(ciphertext);
             InputData data = new InputData(in, in.available());
 
-            PgpDecryptVerify op = new PgpDecryptVerify(RuntimeEnvironment.application,
+            PgpDecryptVerifyOperation op = new PgpDecryptVerifyOperation(RuntimeEnvironment.application,
                     new ProviderHelper(RuntimeEnvironment.application), null);
             PgpDecryptVerifyInputParcel input = new PgpDecryptVerifyInputParcel();
             input.setAllowSymmetricDecryption(true);
@@ -269,7 +269,7 @@ public class PgpEncryptDecryptTest {
             ByteArrayInputStream in = new ByteArrayInputStream(ciphertext);
             InputData data = new InputData(in, in.available());
 
-            PgpDecryptVerify op = new PgpDecryptVerify(RuntimeEnvironment.application,
+            PgpDecryptVerifyOperation op = new PgpDecryptVerifyOperation(RuntimeEnvironment.application,
                     new ProviderHelper(RuntimeEnvironment.application), null);
             PgpDecryptVerifyInputParcel input = new PgpDecryptVerifyInputParcel();
             input.setAllowSymmetricDecryption(false);
@@ -318,7 +318,7 @@ public class PgpEncryptDecryptTest {
             ByteArrayInputStream in = new ByteArrayInputStream(ciphertext);
             InputData data = new InputData(in, in.available());
 
-            PgpDecryptVerify op = operationWithFakePassphraseCache(null, null, null);
+            PgpDecryptVerifyOperation op = operationWithFakePassphraseCache(null, null, null);
             PgpDecryptVerifyInputParcel input = new PgpDecryptVerifyInputParcel();
             DecryptVerifyResult result = op.execute(input, new CryptoInputParcel(mKeyPhrase1), data, out);
 
@@ -346,7 +346,7 @@ public class PgpEncryptDecryptTest {
             ByteArrayInputStream in = new ByteArrayInputStream(ciphertext);
             InputData data = new InputData(in, in.available());
 
-            PgpDecryptVerify op = operationWithFakePassphraseCache(
+            PgpDecryptVerifyOperation op = operationWithFakePassphraseCache(
                     mKeyPhrase1, mStaticRing1.getMasterKeyId(), null);
             PgpDecryptVerifyInputParcel input = new PgpDecryptVerifyInputParcel();
             DecryptVerifyResult result = op.execute(input, new CryptoInputParcel(), data, out);
@@ -370,7 +370,7 @@ public class PgpEncryptDecryptTest {
             ByteArrayInputStream in = new ByteArrayInputStream(ciphertext);
             InputData data = new InputData(in, in.available());
 
-            PgpDecryptVerify op = operationWithFakePassphraseCache(
+            PgpDecryptVerifyOperation op = operationWithFakePassphraseCache(
                     null, mStaticRing1.getMasterKeyId(), null);
             PgpDecryptVerifyInputParcel input = new PgpDecryptVerifyInputParcel();
             DecryptVerifyResult result = op.execute(input, new CryptoInputParcel(), data, out);
@@ -519,7 +519,7 @@ public class PgpEncryptDecryptTest {
             ByteArrayInputStream in = new ByteArrayInputStream(ciphertext);
             InputData data = new InputData(in, in.available());
 
-            PgpDecryptVerify op = operationWithFakePassphraseCache(
+            PgpDecryptVerifyOperation op = operationWithFakePassphraseCache(
                     mKeyPhrase1, mStaticRing1.getMasterKeyId(), null);
             PgpDecryptVerifyInputParcel input = new PgpDecryptVerifyInputParcel();
             DecryptVerifyResult result = op.execute(input, new CryptoInputParcel(), data, out);
@@ -548,7 +548,7 @@ public class PgpEncryptDecryptTest {
             allowed.add(mStaticRing2.getMasterKeyId());
 
             // provide passphrase for the second, and check that the first is never asked for!
-            PgpDecryptVerify op = operationWithFakePassphraseCache(
+            PgpDecryptVerifyOperation op = operationWithFakePassphraseCache(
                     mKeyPhrase2, mStaticRing2.getMasterKeyId(), null);
             PgpDecryptVerifyInputParcel input = new PgpDecryptVerifyInputParcel();
             input.setAllowedKeyIds(allowed);
@@ -571,7 +571,7 @@ public class PgpEncryptDecryptTest {
             InputData data = new InputData(in, in.available());
 
             // provide passphrase for the second, and check that the first is never asked for!
-            PgpDecryptVerify op = operationWithFakePassphraseCache(
+            PgpDecryptVerifyOperation op = operationWithFakePassphraseCache(
                     mKeyPhrase2, mStaticRing2.getMasterKeyId(), null);
             PgpDecryptVerifyInputParcel input = new PgpDecryptVerifyInputParcel();
             input.setAllowedKeyIds(new HashSet<Long>());
@@ -594,7 +594,7 @@ public class PgpEncryptDecryptTest {
             ByteArrayInputStream in = new ByteArrayInputStream(ciphertext);
             InputData data = new InputData(in, in.available());
 
-            PgpDecryptVerify op = operationWithFakePassphraseCache(
+            PgpDecryptVerifyOperation op = operationWithFakePassphraseCache(
                     mKeyPhrase2, mStaticRing2.getMasterKeyId(), null);
             PgpDecryptVerifyInputParcel input = new PgpDecryptVerifyInputParcel();
             DecryptVerifyResult result = op.execute(input, new CryptoInputParcel(), data, out);
@@ -648,7 +648,7 @@ public class PgpEncryptDecryptTest {
             ByteArrayInputStream in = new ByteArrayInputStream(ciphertext);
             InputData data = new InputData(in, in.available());
 
-            PgpDecryptVerify op = operationWithFakePassphraseCache(
+            PgpDecryptVerifyOperation op = operationWithFakePassphraseCache(
                     mKeyPhrase1, mStaticRing1.getMasterKeyId(), null);
             PgpDecryptVerifyInputParcel input = new PgpDecryptVerifyInputParcel();
             DecryptVerifyResult result = op.execute(input, new CryptoInputParcel(), data, out);
@@ -675,7 +675,7 @@ public class PgpEncryptDecryptTest {
             ByteArrayInputStream in = new ByteArrayInputStream(ciphertext);
             InputData data = new InputData(in, in.available());
 
-            PgpDecryptVerify op = operationWithFakePassphraseCache(
+            PgpDecryptVerifyOperation op = operationWithFakePassphraseCache(
                     mKeyPhrase2, mStaticRing2.getMasterKeyId(), null);
             PgpDecryptVerifyInputParcel input = new PgpDecryptVerifyInputParcel();
             DecryptVerifyResult result = op.execute(input, new CryptoInputParcel(), data, out);
@@ -730,7 +730,7 @@ public class PgpEncryptDecryptTest {
             ByteArrayInputStream in = new ByteArrayInputStream(ciphertext);
             InputData data = new InputData(in, in.available());
 
-            PgpDecryptVerify op = operationWithFakePassphraseCache(null, null, null);
+            PgpDecryptVerifyOperation op = operationWithFakePassphraseCache(null, null, null);
             PgpDecryptVerifyInputParcel input = new PgpDecryptVerifyInputParcel();
             DecryptVerifyResult result = op.execute(input, new CryptoInputParcel(mKeyPhrase1), data, out);
 
@@ -796,7 +796,7 @@ public class PgpEncryptDecryptTest {
             ByteArrayInputStream in = new ByteArrayInputStream(ciphertext);
             InputData data = new InputData(in, in.available());
 
-            PgpDecryptVerify op = operationWithFakePassphraseCache(null, null, null);
+            PgpDecryptVerifyOperation op = operationWithFakePassphraseCache(null, null, null);
             PgpDecryptVerifyInputParcel input = new PgpDecryptVerifyInputParcel();
             DecryptVerifyResult result = op.execute(input, new CryptoInputParcel(passphrase), data, out);
 
@@ -819,10 +819,10 @@ public class PgpEncryptDecryptTest {
         }
     }
 
-    private PgpDecryptVerify operationWithFakePassphraseCache(
+    private PgpDecryptVerifyOperation operationWithFakePassphraseCache(
             final Passphrase passphrase, final Long checkMasterKeyId, final Long checkSubKeyId) {
 
-        return new PgpDecryptVerify(RuntimeEnvironment.application,
+        return new PgpDecryptVerifyOperation(RuntimeEnvironment.application,
                 new ProviderHelper(RuntimeEnvironment.application), null) {
             @Override
             public Passphrase getCachedPassphrase(long masterKeyId, long subKeyId)