cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix saving new key (tmp)

Browse Source
This commit is contained in:
Ashley Hughes
2014-03-06 13:00:17 +00:00
parent 8662ca2928
commit 01951810ae
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
View File

@@ -550,8 +550,13 @@ public class KeychainIntentService extends IntentService implements ProgressDial
ArrayList<String> deleted_ids = data.getStringArrayList(SAVE_KEYRING_DELETED_IDS);
boolean[] modded_keys = data.getBooleanArray(SAVE_KEYRING_MODDED_KEYS);
boolean[] new_keys = data.getBooleanArray(SAVE_KEYRING_NEW_KEYS);
ArrayList<PGPSecretKey> deletedKeys = PgpConversionHelper.BytesToPGPSecretKeyList(data
byte[] tmp = data.getByteArray(SAVE_KEYRING_DELETED_KEYS);
ArrayList<PGPSecretKey> deletedKeys;
if (tmp != null)
deletedKeys = PgpConversionHelper.BytesToPGPSecretKeyList(data
.getByteArray(SAVE_KEYRING_DELETED_KEYS));
else
deletedKeys = new ArrayList<PGPSecretKey>();
boolean primaryChanged = data.getBoolean(SAVE_KEYRING_PRIMARY_ID_CHANGED);
long masterKeyId = data.getLong(SAVE_KEYRING_MASTER_KEY_ID);