1 files changed, 73 insertions, 8 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
index ab76f693e..0b203614b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
@@ -17,17 +17,25 @@
 
 package org.sufficientlysecure.keychain.ui;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
-import android.view.View;
 
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
+import org.sufficientlysecure.keychain.provider.CachedPublicKeyRing;
+import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.ui.base.BaseNfcActivity;
+import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.util.Passphrase;
 
+import java.io.IOException;
 import java.util.ArrayList;
 
-public class CreateKeyActivity extends BaseActivity {
+public class CreateKeyActivity extends BaseNfcActivity {
 
     public static final String EXTRA_NAME = "name";
     public static final String EXTRA_EMAIL = "email";
@@ -35,6 +43,10 @@ public class CreateKeyActivity extends BaseActivity {
     public static final String EXTRA_ADDITIONAL_EMAILS = "additional_emails";
     public static final String EXTRA_PASSPHRASE = "passphrase";
 
+    public static final String EXTRA_NFC_USER_ID = "nfc_user_id";
+    public static final String EXTRA_NFC_AID = "nfc_aid";
+    public static final String EXTRA_NFC_FINGERPRINTS = "nfc_fingerprints";
+
     public static final String FRAGMENT_TAG = "currentFragment";
 
     String mName;
@@ -60,14 +72,29 @@ public class CreateKeyActivity extends BaseActivity {
 
             mCurrentFragment = getSupportFragmentManager().findFragmentByTag(FRAGMENT_TAG);
         } else {
+
+            Intent intent = getIntent();
             // Initialize members with default values for a new instance
-            mName = getIntent().getStringExtra(EXTRA_NAME);
-            mEmail = getIntent().getStringExtra(EXTRA_EMAIL);
-            mFirstTime = getIntent().getBooleanExtra(EXTRA_FIRST_TIME, false);
+            mName = intent.getStringExtra(EXTRA_NAME);
+            mEmail = intent.getStringExtra(EXTRA_EMAIL);
+            mFirstTime = intent.getBooleanExtra(EXTRA_FIRST_TIME, false);
+
+            if (intent.hasExtra(EXTRA_NFC_FINGERPRINTS)) {
+                byte[] nfcFingerprints = intent.getByteArrayExtra(EXTRA_NFC_FINGERPRINTS);
+                String nfcUserId = intent.getStringExtra(EXTRA_NFC_USER_ID);
+                byte[] nfcAid = intent.getByteArrayExtra(EXTRA_NFC_AID);
+
+                Fragment frag2 = CreateKeyYubiImportFragment.createInstance(
+                        nfcFingerprints, nfcAid, nfcUserId);
+                loadFragment(frag2, FragAction.START);
+
+                setTitle(R.string.title_import_keys);
+                return;
+            } else {
+                CreateKeyStartFragment frag = CreateKeyStartFragment.newInstance();
+                loadFragment(frag, FragAction.START);
+            }
 
-            // Start with first fragment of wizard
-            CreateKeyStartFragment frag = CreateKeyStartFragment.newInstance();
-            loadFragment(frag, FragAction.START);
         }
 
         if (mFirstTime) {
@@ -80,6 +107,38 @@ public class CreateKeyActivity extends BaseActivity {
     }
 
     @Override
+    protected void onNfcPerform() throws IOException {
+        if (mCurrentFragment instanceof NfcListenerFragment) {
+            ((NfcListenerFragment) mCurrentFragment).onNfcPerform();
+            return;
+        }
+
+        byte[] scannedFingerprints = nfcGetFingerprints();
+        byte[] nfcAid = nfcGetAid();
+        String userId = nfcGetUserId();
+
+        try {
+            long masterKeyId = KeyFormattingUtils.getKeyIdFromFingerprint(scannedFingerprints);
+            CachedPublicKeyRing ring = new ProviderHelper(this).getCachedPublicKeyRing(masterKeyId);
+            ring.getMasterKeyId();
+
+            Intent intent = new Intent(this, ViewKeyActivity.class);
+            intent.setData(KeyRings.buildGenericKeyRingUri(masterKeyId));
+            intent.putExtra(ViewKeyActivity.EXTRA_NFC_AID, nfcAid);
+            intent.putExtra(ViewKeyActivity.EXTRA_NFC_USER_ID, userId);
+            intent.putExtra(ViewKeyActivity.EXTRA_NFC_FINGERPRINTS, scannedFingerprints);
+            startActivity(intent);
+            finish();
+
+        } catch (PgpKeyNotFoundException e) {
+            Fragment frag = CreateKeyYubiImportFragment.createInstance(
+                    scannedFingerprints, nfcAid, userId);
+            loadFragment(frag, FragAction.TO_RIGHT);
+        }
+
+    }
+
+    @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
 
@@ -125,8 +184,14 @@ public class CreateKeyActivity extends BaseActivity {
                 break;
 
         }
+
         // do it immediately!
         getSupportFragmentManager().executePendingTransactions();
+
+    }
+
+    interface NfcListenerFragment {
+        public void onNfcPerform() throws IOException;
     }
 
 }