diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-07 08:51:56 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-07 08:51:56 +0200 |
| commit | bac767d184b9120a251330242a79ed363ad854fc (patch) | |
| tree | 03775adf7e5c416f0e38d0389d752eadd4b28c01 /OpenKeychain | |
| parent | ef67962c5d4309d2c31029f112d0c5410be28bb0 (diff) | |
| download | open-keychain-bac767d184b9120a251330242a79ed363ad854fc.tar.gz open-keychain-bac767d184b9120a251330242a79ed363ad854fc.tar.bz2 open-keychain-bac767d184b9120a251330242a79ed363ad854fc.zip | |
Edit key: prevent the combination of change to primary user id and revocation
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java index 5be196a45..ae294547f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java @@ -339,6 +339,10 @@ public class EditKeyFragment extends LoaderFragment implements mSaveKeyringParcel.mRevokeUserIds.remove(userId); } else { mSaveKeyringParcel.mRevokeUserIds.add(userId); + // not possible to revoke and change to primary user id + if (mSaveKeyringParcel.mChangePrimaryUserId.equals(userId)) { + mSaveKeyringParcel.mChangePrimaryUserId = null; + } } break; } |