diff options
author | Michal Kepkowski <michal.kepkowski@sagiton.pl> | 2016-04-06 19:16:10 +0200 |
---|---|---|
committer | Michal Kepkowski <michal.kepkowski@sagiton.pl> | 2016-04-06 19:16:10 +0200 |
commit | d9988a8cdacb38ce1a1874d1fbb65ff7eb8f8acd (patch) | |
tree | a2c6bad3a5da60d4e1fcfc75f2588821d699ea01 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java | |
parent | dac5f1db08b4dea5893d9fe0a1ab0daad5b44f09 (diff) | |
parent | 88ba5688d8e110fc6676c701359bb2bbca7efb77 (diff) | |
download | open-keychain-d9988a8cdacb38ce1a1874d1fbb65ff7eb8f8acd.tar.gz open-keychain-d9988a8cdacb38ce1a1874d1fbb65ff7eb8f8acd.tar.bz2 open-keychain-d9988a8cdacb38ce1a1874d1fbb65ff7eb8f8acd.zip |
Merge branch 'master' into okhttp3
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java')
-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; |