diff options
| author | Vincent <valodim@mugenguild.com> | 2016-04-04 10:53:11 +0200 |
|---|---|---|
| committer | Vincent <valodim@mugenguild.com> | 2016-04-04 10:53:11 +0200 |
| commit | e0463ec8180cee0af9d9987a3d529d391cfe6a2e (patch) | |
| tree | 5b289f54ccc509bb5e5906f11103f8288e6229b6 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java | |
| parent | f98279bc7002a0cb1ca073cd1c57a36b8b491211 (diff) | |
| parent | cb9bdb3cf72ec387e6f34d29a31e701f5f5e7d92 (diff) | |
| download | open-keychain-e0463ec8180cee0af9d9987a3d529d391cfe6a2e.tar.gz open-keychain-e0463ec8180cee0af9d9987a3d529d391cfe6a2e.tar.bz2 open-keychain-e0463ec8180cee0af9d9987a3d529d391cfe6a2e.zip | |
Merge pull request #1796 from AlexFJW/LimitCreateKeyOptions
Refer to issue #1600 Limit create key options
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 2184f91f1..4cbb4724e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java @@ -561,15 +561,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() { |