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/util | |
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/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; |