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/util | |
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/util')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java index 48f10d4b9..5ffce9f24 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java @@ -18,12 +18,15 @@ package org.sufficientlysecure.keychain.util; public class Choice <E> { + private String mName; private E mId; + private String mDescription; - public Choice(E id, String name) { + public Choice(E id, String name, String description) { mId = id; mName = name; + mDescription = description; } public E getId() { @@ -34,6 +37,10 @@ public class Choice <E> { return mName; } + public String getDescription() { + return mDescription; + } + @Override public String toString() { return mName; |