Change PIN and Admin PIN after move to key operation

1 files changed, 8 insertions, 2 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
index 8c7abb874..94bb68f7e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
@@ -267,10 +267,11 @@ public class CreateKeyFinalFragment extends Fragment {
     }
 
     private void moveToCard(final EditKeyResult saveKeyResult) {
-        CachedPublicKeyRing key = (new ProviderHelper(getActivity()))
-                .getCachedPublicKeyRing(saveKeyResult.mMasterKeyId);
+        final CreateKeyActivity createKeyActivity = (CreateKeyActivity) getActivity();
 
         final SaveKeyringParcel changeKeyringParcel;
+        CachedPublicKeyRing key = (new ProviderHelper(getActivity()))
+                .getCachedPublicKeyRing(saveKeyResult.mMasterKeyId);
         try {
             changeKeyringParcel = new SaveKeyringParcel(key.getMasterKeyId(), key.getFingerprint());
         } catch (PgpKeyNotFoundException e) {
@@ -278,6 +279,7 @@ public class CreateKeyFinalFragment extends Fragment {
             return;
         }
 
+        // define subkeys that should be moved to the card
         Cursor cursor = getActivity().getContentResolver().query(
                 KeychainContract.Keys.buildKeysUri(changeKeyringParcel.mMasterKeyId),
                 new String[]{KeychainContract.Keys.KEY_ID,}, null, null, null
@@ -293,6 +295,10 @@ public class CreateKeyFinalFragment extends Fragment {
             }
         }
 
+        // define new PIN and Admin PIN for the card
+        changeKeyringParcel.mCardPin = createKeyActivity.mYubiKeyPin;
+        changeKeyringParcel.mCardAdminPin = createKeyActivity.mYubiKeyAdminPin;
+
         CryptoOperationHelper.Callback<SaveKeyringParcel, EditKeyResult> callback
                 = new CryptoOperationHelper.Callback<SaveKeyringParcel, EditKeyResult>() {