diff options
| author | Alex Fong <alexfongg@gmail.com> | 2016-03-21 21:37:19 +0800 |
|---|---|---|
| committer | Alex Fong <alexfongg@gmail.com> | 2016-04-01 23:12:11 +0800 |
| commit | cb9bdb3cf72ec387e6f34d29a31e701f5f5e7d92 (patch) | |
| tree | 334ae1c8bb7cb959d61b9b67d1cee9fc8d24a792 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java | |
| parent | ce5e5f36c56fe14cb4a90a912eece07e4cb92285 (diff) | |
| download | open-keychain-cb9bdb3cf72ec387e6f34d29a31e701f5f5e7d92.tar.gz open-keychain-cb9bdb3cf72ec387e6f34d29a31e701f5f5e7d92.tar.bz2 open-keychain-cb9bdb3cf72ec387e6f34d29a31e701f5f5e7d92.zip | |
Redesigned subkey creation dialog and changed default key type created to RSA, 3072 bit.
Added code to prevent removal of master subkey when modifying a new key.
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java | 10 |
1 files changed, 2 insertions, 8 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 2d94d0d93..1571a7104 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java @@ -562,15 +562,9 @@ public class EditKeyFragment extends QueueingCryptoOperationFragment<SaveKeyring } private void addSubkey() { - boolean willBeMasterKey; - if (mSubkeysAdapter != null) { - willBeMasterKey = mSubkeysAdapter.getCount() == 0 && mSubkeysAddedAdapter.getCount() == 0; - } else { - willBeMasterKey = mSubkeysAddedAdapter.getCount() == 0; - } - + // new subkey will never be a masterkey, as masterkey cannot be removed AddSubkeyDialogFragment addSubkeyDialogFragment = - AddSubkeyDialogFragment.newInstance(willBeMasterKey); + AddSubkeyDialogFragment.newInstance(false); addSubkeyDialogFragment .setOnAlgorithmSelectedListener( new AddSubkeyDialogFragment.OnAlgorithmSelectedListener() { |