From 362c83abe759cc0c5ed14e177e83d3279f25e52e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 1 Jul 2015 16:06:12 +0200
Subject: Add create key fragments for YubiKey PINs

---
 .../keychain/ui/CreateKeyActivity.java             | 26 ++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java')

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 505638c7c..36ab62cb4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
@@ -42,7 +42,9 @@ public class CreateKeyActivity extends BaseNfcActivity {
     public static final String EXTRA_FIRST_TIME = "first_time";
     public static final String EXTRA_ADDITIONAL_EMAILS = "additional_emails";
     public static final String EXTRA_PASSPHRASE = "passphrase";
-    public static final String EXTRA_USE_SMART_CARD_SETTINGS = "use_smart_card_settings";
+    public static final String EXTRA_CREATE_YUBI_KEY = "create_yubi_key";
+    public static final String EXTRA_YUBI_KEY_PIN = "yubi_key_pin";
+    public static final String EXTRA_YUBI_KEY_ADMIN_PIN = "yubi_key_admin_pin";
 
     public static final String EXTRA_NFC_USER_ID = "nfc_user_id";
     public static final String EXTRA_NFC_AID = "nfc_aid";
@@ -55,7 +57,9 @@ public class CreateKeyActivity extends BaseNfcActivity {
     ArrayList<String> mAdditionalEmails;
     Passphrase mPassphrase;
     boolean mFirstTime;
-    boolean mUseSmartCardSettings;
+    boolean mCreateYubiKey;
+    String mYubiKeyPin;
+    String mYubiKeyAdminPin;
 
     Fragment mCurrentFragment;
 
@@ -88,7 +92,9 @@ public class CreateKeyActivity extends BaseNfcActivity {
             mAdditionalEmails = savedInstanceState.getStringArrayList(EXTRA_ADDITIONAL_EMAILS);
             mPassphrase = savedInstanceState.getParcelable(EXTRA_PASSPHRASE);
             mFirstTime = savedInstanceState.getBoolean(EXTRA_FIRST_TIME);
-            mUseSmartCardSettings = savedInstanceState.getBoolean(EXTRA_USE_SMART_CARD_SETTINGS);
+            mCreateYubiKey = savedInstanceState.getBoolean(EXTRA_CREATE_YUBI_KEY);
+            mYubiKeyPin = savedInstanceState.getString(EXTRA_YUBI_KEY_PIN);
+            mYubiKeyAdminPin = savedInstanceState.getString(EXTRA_YUBI_KEY_ADMIN_PIN);
 
             mCurrentFragment = getSupportFragmentManager().findFragmentByTag(FRAGMENT_TAG);
         } else {
@@ -98,7 +104,7 @@ public class CreateKeyActivity extends BaseNfcActivity {
             mName = intent.getStringExtra(EXTRA_NAME);
             mEmail = intent.getStringExtra(EXTRA_EMAIL);
             mFirstTime = intent.getBooleanExtra(EXTRA_FIRST_TIME, false);
-            mUseSmartCardSettings = intent.getBooleanExtra(EXTRA_USE_SMART_CARD_SETTINGS, false);
+            mCreateYubiKey = intent.getBooleanExtra(EXTRA_CREATE_YUBI_KEY, false);
 
             if (intent.hasExtra(EXTRA_NFC_FINGERPRINTS)) {
                 byte[] nfcFingerprints = intent.getByteArrayExtra(EXTRA_NFC_FINGERPRINTS);
@@ -106,13 +112,13 @@ public class CreateKeyActivity extends BaseNfcActivity {
                 byte[] nfcAid = intent.getByteArrayExtra(EXTRA_NFC_AID);
 
                 if (containsKeys(nfcFingerprints)) {
-                    Fragment frag = CreateKeyYubiKeyImportFragment.newInstance(
+                    Fragment frag = CreateYubiKeyImportFragment.newInstance(
                             nfcFingerprints, nfcAid, nfcUserId);
                     loadFragment(frag, FragAction.START);
 
                     setTitle(R.string.title_import_keys);
                 } else {
-                    Fragment frag = CreateKeyYubiKeyBlankFragment.newInstance();
+                    Fragment frag = CreateYubiKeyBlankFragment.newInstance();
                     loadFragment(frag, FragAction.START);
                     setTitle(R.string.title_manage_my_keys);
                 }
@@ -161,12 +167,12 @@ public class CreateKeyActivity extends BaseNfcActivity {
                 finish();
 
             } catch (PgpKeyNotFoundException e) {
-                Fragment frag = CreateKeyYubiKeyImportFragment.newInstance(
+                Fragment frag = CreateYubiKeyImportFragment.newInstance(
                         scannedFingerprints, nfcAid, userId);
                 loadFragment(frag, FragAction.TO_RIGHT);
             }
         } else {
-            Fragment frag = CreateKeyYubiKeyBlankFragment.newInstance();
+            Fragment frag = CreateYubiKeyBlankFragment.newInstance();
             loadFragment(frag, FragAction.TO_RIGHT);
         }
 
@@ -193,7 +199,9 @@ public class CreateKeyActivity extends BaseNfcActivity {
         outState.putStringArrayList(EXTRA_ADDITIONAL_EMAILS, mAdditionalEmails);
         outState.putParcelable(EXTRA_PASSPHRASE, mPassphrase);
         outState.putBoolean(EXTRA_FIRST_TIME, mFirstTime);
-        outState.putBoolean(EXTRA_USE_SMART_CARD_SETTINGS, mUseSmartCardSettings);
+        outState.putBoolean(EXTRA_CREATE_YUBI_KEY, mCreateYubiKey);
+        outState.putString(EXTRA_YUBI_KEY_PIN, mYubiKeyPin);
+        outState.putString(EXTRA_YUBI_KEY_ADMIN_PIN, mYubiKeyAdminPin);
     }
 
     @Override
-- 
cgit v1.2.3