1 files changed, 17 insertions, 29 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
index 044d15ec7..6ce2a8f6b 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
@@ -36,6 +36,7 @@ import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.service.KeychainIntentService;
 import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
 import org.sufficientlysecure.keychain.service.PassphraseCacheService;
+import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
 import org.sufficientlysecure.keychain.ui.dialog.DeleteKeyDialogFragment;
 import org.sufficientlysecure.keychain.ui.dialog.PassphraseDialogFragment;
 import org.sufficientlysecure.keychain.ui.dialog.SetPassphraseDialogFragment;
@@ -570,38 +571,25 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
 
             intent.setAction(KeychainIntentService.ACTION_SAVE_KEYRING);
 
+            SaveKeyringParcel saveParams = new SaveKeyringParcel();
+            saveParams.userIDs = getUserIds(mUserIdsView);
+            saveParams.originalIDs = mUserIdsView.getOriginalIDs();
+            saveParams.deletedIDs = mUserIdsView.getDeletedIDs();
+            saveParams.primaryIDChanged = mUserIdsView.primaryChanged();
+            saveParams.moddedKeys = toPrimitiveArray(mKeysView.getNeedsSavingArray());
+            saveParams.deletedKeys = mKeysView.getDeletedKeys();
+            saveParams.keysExpiryDates = getKeysExpiryDates(mKeysView);
+            saveParams.keysUsages = getKeysUsages(mKeysView);
+            saveParams.newPassPhrase = mNewPassPhrase;
+            saveParams.oldPassPhrase = mCurrentPassPhrase;
+            saveParams.newKeys = toPrimitiveArray(mKeysView.getNewKeysArray());
+            saveParams.keys = getKeys(mKeysView);
+
+
             // fill values for this action
             Bundle data = new Bundle();
-            data.putString(KeychainIntentService.SAVE_KEYRING_CURRENT_PASSPHRASE,
-                    mCurrentPassPhrase);
-            data.putString(KeychainIntentService.SAVE_KEYRING_NEW_PASSPHRASE, mNewPassPhrase);
-            data.putStringArrayList(KeychainIntentService.SAVE_KEYRING_USER_IDS,
-                    getUserIds(mUserIdsView));
-            ArrayList<PGPSecretKey> keys = getKeys(mKeysView);
-            data.putByteArray(KeychainIntentService.SAVE_KEYRING_KEYS,
-                    PgpConversionHelper.PGPSecretKeyArrayListToBytes(keys));
-            ArrayList<PGPSecretKey> dKeys = mKeysView.getDeletedKeys();
-            byte[] tmp = null;
-            if (dKeys.size() != 0)
-                tmp = PgpConversionHelper.PGPSecretKeyArrayListToBytes(dKeys);
-            data.putByteArray(KeychainIntentService.SAVE_KEYRING_DELETED_KEYS,
-                    tmp);
-            data.putIntegerArrayList(KeychainIntentService.SAVE_KEYRING_KEYS_USAGES,
-                    getKeysUsages(mKeysView));
-            data.putSerializable(KeychainIntentService.SAVE_KEYRING_KEYS_EXPIRY_DATES,
-                    getKeysExpiryDates(mKeysView));
-            data.putLong(KeychainIntentService.SAVE_KEYRING_MASTER_KEY_ID, getMasterKeyId());
             data.putBoolean(KeychainIntentService.SAVE_KEYRING_CAN_SIGN, masterCanSign);
-            data.putStringArrayList(KeychainIntentService.SAVE_KEYRING_DELETED_IDS,
-                    mUserIdsView.getDeletedIDs());
-            data.putStringArrayList(KeychainIntentService.SAVE_KEYRING_ORIGINAL_IDS,
-                    mUserIdsView.getOriginalIDs());
-            data.putBooleanArray(KeychainIntentService.SAVE_KEYRING_MODDED_KEYS,
-                    toPrimitiveArray(mKeysView.getNeedsSavingArray()));
-            data.putBoolean(KeychainIntentService.SAVE_KEYRING_PRIMARY_ID_CHANGED,
-                    mUserIdsView.primaryChanged());
-            data.putBooleanArray(KeychainIntentService.SAVE_KEYRING_NEW_KEYS,
-                    toPrimitiveArray(mKeysView.getNewKeysArray()));
+            data.putParcelable(KeychainIntentService.SAVE_KEYRING_PARCEL, saveParams);
 
             intent.putExtra(KeychainIntentService.EXTRA_DATA, data);