diff options
| author | Joey Castillo <jose.castillo@gmail.com> | 2015-05-13 05:33:28 -0400 |
|---|---|---|
| committer | Joey Castillo <jose.castillo@gmail.com> | 2015-05-13 14:36:30 -0400 |
| commit | d21fb7733697a8f947604dbd1d6c608f5b2a21d5 (patch) | |
| tree | 1ae3348b7047b351a598dd71b8d5e4e8ffed74dd /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java | |
| parent | a0107afd3efefb152b5691b04c6343a4382fcd6a (diff) | |
| download | open-keychain-d21fb7733697a8f947604dbd1d6c608f5b2a21d5.tar.gz open-keychain-d21fb7733697a8f947604dbd1d6c608f5b2a21d5.tar.bz2 open-keychain-d21fb7733697a8f947604dbd1d6c608f5b2a21d5.zip | |
Moving keytocard process into PgpKeyOperation.
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java index 2e0524141..6064c28fb 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java @@ -95,7 +95,8 @@ public class SaveKeyringParcel implements Parcelable { } for (SubkeyChange change : mChangeSubKeys) { - if (change.mRecertify || change.mFlags != null || change.mExpiry != null) { + if (change.mRecertify || change.mFlags != null || change.mExpiry != null || + (change.mDummyDivert != null && change.mDummyDivert.length == 0)) { return false; } } |