1 files changed, 12 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java
index b79d3305d..86b0a36d0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java
@@ -110,10 +110,7 @@ public class NfcOperationActivity extends BaseNfcActivity {
             public void onClick(View v) {
                 resumeTagHandling();
 
-                // obtain passphrase for this subkey
-                if (mRequiredInput.mType != RequiredInputParcel.RequiredInputType.NFC_MOVE_KEY_TO_CARD) {
-                    obtainYubiKeyPin(mRequiredInput);
-                }
+                obtainPassphraseIfRequired();
                 vAnimator.setDisplayedChild(0);
             }
         });
@@ -132,8 +129,13 @@ public class NfcOperationActivity extends BaseNfcActivity {
         mRequiredInput = data.getParcelable(EXTRA_REQUIRED_INPUT);
         mServiceIntent = data.getParcelable(EXTRA_SERVICE_INTENT);
 
+        obtainPassphraseIfRequired();
+    }
+
+    private void obtainPassphraseIfRequired() {
         // obtain passphrase for this subkey
-        if (mRequiredInput.mType != RequiredInputParcel.RequiredInputType.NFC_MOVE_KEY_TO_CARD) {
+        if (mRequiredInput.mType != RequiredInputParcel.RequiredInputType.NFC_MOVE_KEY_TO_CARD
+                && mRequiredInput.mType != RequiredInputParcel.RequiredInputType.NFC_RESET_CARD) {
             obtainYubiKeyPin(mRequiredInput);
         }
     }
@@ -248,6 +250,11 @@ public class NfcOperationActivity extends BaseNfcActivity {
 
                 break;
             }
+            case NFC_RESET_CARD: {
+                nfcResetCard();
+
+                break;
+            }
             default: {
                 throw new AssertionError("Unhandled mRequiredInput.mType");
             }