diff options
| author | Daniel Albert <albert_daniel@t-online.de> | 2014-06-30 19:09:56 +0200 |
|---|---|---|
| committer | Daniel Albert <albert_daniel@t-online.de> | 2014-06-30 19:09:56 +0200 |
| commit | df9af316b464262fe522b31dff764879e57eb6ea (patch) | |
| tree | fb84b62ad7dc078c8f87e546ac1539b3622efb27 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java | |
| parent | 1e9789f5b4e536f79df0ab948b8618c0d7235ad0 (diff) | |
| parent | 6d7a9ec48a6517adfe94ed2edfa875def538d088 (diff) | |
| download | open-keychain-df9af316b464262fe522b31dff764879e57eb6ea.tar.gz open-keychain-df9af316b464262fe522b31dff764879e57eb6ea.tar.bz2 open-keychain-df9af316b464262fe522b31dff764879e57eb6ea.zip | |
Merge branch 'master' of https://github.com/open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java index bc1c84271..9b561f819 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java @@ -118,7 +118,7 @@ public class UserIdEditor extends LinearLayout implements Editor, OnClickListene mEmail.setAdapter( new ArrayAdapter<String> (this.getContext(), android.R.layout.simple_dropdown_item_1line, - ContactHelper.getMailAccounts(getContext()) + ContactHelper.getPossibleUserEmails(getContext()) )); mEmail.addTextChangedListener(new TextWatcher(){ @Override |