aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
diff options
context:
space:
mode:
authorAshley Hughes <spirit.returned@gmail.com>2014-02-15 14:45:57 +0000
committerAshley Hughes <spirit.returned@gmail.com>2014-02-15 14:45:57 +0000
commitc9d9c800b609d4bc9ed4b9f20a4085d4ad3f13bc (patch)
tree136c6367c05859a8a19a901fb244af2069189730 /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
parentba62d30563ee5dd316528decd272f1bbdcbee5bd (diff)
downloadopen-keychain-c9d9c800b609d4bc9ed4b9f20a4085d4ad3f13bc.tar.gz
open-keychain-c9d9c800b609d4bc9ed4b9f20a4085d4ad3f13bc.tar.bz2
open-keychain-c9d9c800b609d4bc9ed4b9f20a4085d4ad3f13bc.zip
pass through deleted keys
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java')
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java3
1 files changed, 3 insertions, 0 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 9ebe73197..ec7dd1330 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
@@ -580,6 +580,9 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
ArrayList<PGPSecretKey> keys = getKeys(mKeysView);
data.putByteArray(KeychainIntentService.SAVE_KEYRING_KEYS,
PgpConversionHelper.PGPSecretKeyArrayListToBytes(keys));
+ ArrayList<PGPSecretKey> dKeys = mKeysView.getDeletedKeys();
+ data.putByteArray(KeychainIntentService.SAVE_KEYRING_DELETED_KEYS,
+ PgpConversionHelper.PGPSecretKeyArrayListToBytes(dKeys));
data.putIntegerArrayList(KeychainIntentService.SAVE_KEYRING_KEYS_USAGES,
getKeysUsages(mKeysView));
data.putSerializable(KeychainIntentService.SAVE_KEYRING_KEYS_EXPIRY_DATES,