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

Edit key: prevent the combination of change to primary user id and revocation

Browse Source
This commit is contained in:
Dominik Schürmann
2014-08-07 08:51:56 +02:00
parent ef67962c5d
commit bac767d184
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
View File

@@ -339,6 +339,10 @@ public class EditKeyFragment extends LoaderFragment implements
mSaveKeyringParcel.mRevokeUserIds.remove(userId); mSaveKeyringParcel.mRevokeUserIds.remove(userId);
} else { } else {
mSaveKeyringParcel.mRevokeUserIds.add(userId); mSaveKeyringParcel.mRevokeUserIds.add(userId);
// not possible to revoke and change to primary user id
if (mSaveKeyringParcel.mChangePrimaryUserId.equals(userId)) {
mSaveKeyringParcel.mChangePrimaryUserId = null;
}
} }
break; break;
} }