Moving keytocard process into PgpKeyOperation.

4 files changed, 4 insertions, 145 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java
index 4072d91c5..152585040 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java
@@ -83,7 +83,7 @@ public class EditKeyOperation extends BaseOperation {
                     CanonicalizedSecretKeyRing secRing =
                             mProviderHelper.getCanonicalizedSecretKeyRing(saveParcel.mMasterKeyId);
 
-                    modifyResult = keyOperations.modifySecretKeyRing(secRing, cryptoInput, saveParcel);
+                    modifyResult = keyOperations.modifySecretKeyRing(secRing, cryptoInput, saveParcel, log);
                     if (modifyResult.isPending()) {
                         return modifyResult;
                     }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/NfcKeyToCardOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/NfcKeyToCardOperation.java
deleted file mode 100644
index 36f31e20e..000000000
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/NfcKeyToCardOperation.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2015 Joey Castillo <joey@joeycastillo.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.sufficientlysecure.keychain.operations;
-
-import android.content.Context;
-
-import org.spongycastle.bcpg.PublicKeyAlgorithmTags;
-import org.sufficientlysecure.keychain.operations.results.NfcKeyToCardResult;
-import org.sufficientlysecure.keychain.operations.results.OperationResult;
-import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey;
-import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKeyRing;
-import org.sufficientlysecure.keychain.pgp.Progressable;
-import org.sufficientlysecure.keychain.provider.ProviderHelper;
-import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
-import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
-
-public class NfcKeyToCardOperation extends BaseOperation {
-    public NfcKeyToCardOperation(Context context, ProviderHelper providerHelper, Progressable progressable) {
-        super(context, providerHelper, progressable);
-    }
-
-    public NfcKeyToCardResult execute(long subKeyId) {
-        OperationResult.OperationLog log = new OperationResult.OperationLog();
-        int indent = 0;
-        long masterKeyId;
-
-        try {
-            // fetch the indicated master key id
-            masterKeyId = mProviderHelper.getMasterKeyId(subKeyId);
-            CanonicalizedSecretKeyRing keyRing =
-                    mProviderHelper.getCanonicalizedSecretKeyRing(masterKeyId);
-
-            log.add(OperationResult.LogType.MSG_KC_SECRET, indent,
-                    KeyFormattingUtils.convertKeyIdToHex(masterKeyId));
-
-            // fetch the specific subkey
-            CanonicalizedSecretKey subKey = keyRing.getSecretKey(subKeyId);
-
-            // Key algorithm must be RSA
-            int algorithm = subKey.getAlgorithm();
-            if (algorithm != PublicKeyAlgorithmTags.RSA_ENCRYPT &&
-                algorithm != PublicKeyAlgorithmTags.RSA_SIGN &&
-                algorithm != PublicKeyAlgorithmTags.RSA_GENERAL) {
-                log.add(OperationResult.LogType.MSG_K2C_ERROR_BAD_ALGO, indent + 1);
-                return new NfcKeyToCardResult(NfcKeyToCardResult.RESULT_ERROR, log);
-            }
-
-            // Key size must be 2048
-            int keySize = subKey.getBitStrength();
-            if (keySize != 2048) {
-                log.add(OperationResult.LogType.MSG_K2C_ERROR_BAD_SIZE, indent + 1);
-                return new NfcKeyToCardResult(NfcKeyToCardResult.RESULT_ERROR, log);
-            }
-
-            // Secret key parts must be available
-            CanonicalizedSecretKey.SecretKeyType type = subKey.getSecretKeyType();
-            if (type == CanonicalizedSecretKey.SecretKeyType.DIVERT_TO_CARD ||
-                type == CanonicalizedSecretKey.SecretKeyType.GNU_DUMMY) {
-                log.add(OperationResult.LogType.MSG_K2C_ERROR_BAD_STRIPPED, indent + 1);
-                return new NfcKeyToCardResult(NfcKeyToCardResult.RESULT_ERROR, log);
-            }
-
-            if (type == CanonicalizedSecretKey.SecretKeyType.PIN ||
-                type == CanonicalizedSecretKey.SecretKeyType.PATTERN ||
-                type == CanonicalizedSecretKey.SecretKeyType.PASSPHRASE ||
-                type == CanonicalizedSecretKey.SecretKeyType.PASSPHRASE_EMPTY) {
-                log.add(OperationResult.LogType.MSG_PSE_PENDING_NFC, indent);
-                return new NfcKeyToCardResult(log, RequiredInputParcel
-                        .createNfcKeyToCardOperation(masterKeyId, subKeyId));
-            }
-
-            throw new AssertionError("Unhandled SecretKeyType! (should not happen)");
-        } catch (ProviderHelper.NotFoundException e) {
-            log.add(OperationResult.LogType.MSG_PSE_ERROR_UNLOCK, indent);
-            return new NfcKeyToCardResult(NfcKeyToCardResult.RESULT_ERROR, log);
-        }
-    }
-}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/NfcKeyToCardResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/NfcKeyToCardResult.java
deleted file mode 100644
index 93899bbbe..000000000
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/NfcKeyToCardResult.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2015 Joey Castillo <joey@joeycastillo.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.sufficientlysecure.keychain.operations.results;
-
-import android.os.Parcel;
-
-import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
-
-public class NfcKeyToCardResult extends InputPendingResult {
-    public NfcKeyToCardResult(int result, OperationLog log) {
-        super(result, log);
-    }
-
-    public NfcKeyToCardResult(OperationLog log, RequiredInputParcel requiredInput) {
-        super(log, requiredInput);
-    }
-
-    public NfcKeyToCardResult(Parcel source) {
-        super(source);
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        super.writeToParcel(dest, flags);
-    }
-
-    public static Creator<NfcKeyToCardResult> CREATOR = new Creator<NfcKeyToCardResult>() {
-        public NfcKeyToCardResult createFromParcel(final Parcel source) {
-            return new NfcKeyToCardResult(source);
-        }
-
-        public NfcKeyToCardResult[] newArray(final int size) {
-            return new NfcKeyToCardResult[size];
-        }
-    };
-}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
index 4c40b0e5b..065ca710c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
@@ -494,6 +494,7 @@ public abstract class OperationResult implements Parcelable {
         MSG_MF_ERROR_REVOKED_PRIMARY (LogLevel.ERROR, R.string.msg_mf_error_revoked_primary),
         MSG_MF_ERROR_SIG (LogLevel.ERROR, R.string.msg_mf_error_sig),
         MSG_MF_ERROR_SUBKEY_MISSING(LogLevel.ERROR, R.string.msg_mf_error_subkey_missing),
+        MSG_MF_ERROR_CONFLICTING_NFC_COMMANDS(LogLevel.ERROR, R.string.msg_mf_error_conflicting_nfc_commands),
         MSG_MF_MASTER (LogLevel.DEBUG, R.string.msg_mf_master),
         MSG_MF_NOTATION_PIN (LogLevel.DEBUG, R.string.msg_mf_notation_pin),
         MSG_MF_NOTATION_EMPTY (LogLevel.DEBUG, R.string.msg_mf_notation_empty),
@@ -511,6 +512,8 @@ public abstract class OperationResult implements Parcelable {
         MSG_MF_SUBKEY_NEW (LogLevel.INFO, R.string.msg_mf_subkey_new),
         MSG_MF_SUBKEY_REVOKE (LogLevel.INFO, R.string.msg_mf_subkey_revoke),
         MSG_MF_SUBKEY_STRIP (LogLevel.INFO, R.string.msg_mf_subkey_strip),
+        MSG_MF_KEYTOCARD_START (LogLevel.INFO, R.string.msg_mf_keytocard_start),
+        MSG_MF_KEYTOCARD_FINISH (LogLevel.OK, R.string.msg_mf_keytocard_finish),
         MSG_MF_SUCCESS (LogLevel.OK, R.string.msg_mf_success),
         MSG_MF_UID_ADD (LogLevel.INFO, R.string.msg_mf_uid_add),
         MSG_MF_UID_PRIMARY (LogLevel.INFO, R.string.msg_mf_uid_primary),