diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-05-04 14:18:10 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-05-04 14:18:10 +0200 |
commit | 39c610c2d1c35ef107df07bbfd41f6b21ec3df21 (patch) | |
tree | 90d31148e6e45cb9b6d15e373e750a93e7b3f8d2 /OpenKeychain/src/main/java | |
parent | b726dea244f020660d5260d3211d6500655fe680 (diff) | |
parent | ef52a3319a5931c46d5ae5e83f96c503782c805a (diff) | |
download | open-keychain-39c610c2d1c35ef107df07bbfd41f6b21ec3df21.tar.gz open-keychain-39c610c2d1c35ef107df07bbfd41f6b21ec3df21.tar.bz2 open-keychain-39c610c2d1c35ef107df07bbfd41f6b21ec3df21.zip |
Merge branch 'development' of https://github.com/manojkhannakm/open-keychain into manojkhannakm-development
Diffstat (limited to 'OpenKeychain/src/main/java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java index 3d7b31905..f338a53a6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java @@ -133,6 +133,10 @@ public class CreateKeyEmailFragment extends Fragment { addEmail(); } }); + + if (mCreateKeyActivity.mAdditionalEmails != null) { + mEmailAdapter.addAll(mCreateKeyActivity.mAdditionalEmails); + } } if (mAdditionalEmailModels.isEmpty() && mCreateKeyActivity.mAdditionalEmails != null) { mEmailAdapter.addAll(mCreateKeyActivity.mAdditionalEmails); @@ -156,7 +160,7 @@ public class CreateKeyEmailFragment extends Fragment { email.equals(mEmailEdit.getText().toString())) { Notify.create(getActivity(), getString(R.string.create_key_email_already_exists_text), - Notify.LENGTH_LONG, Notify.Style.ERROR).show(); + Notify.LENGTH_LONG, Notify.Style.ERROR).show(CreateKeyEmailFragment.this); return; } //check for duplicated emails inside the adapter @@ -164,7 +168,7 @@ public class CreateKeyEmailFragment extends Fragment { if (email.equals(model.email)) { Notify.create(getActivity(), getString(R.string.create_key_email_already_exists_text), - Notify.LENGTH_LONG, Notify.Style.ERROR).show(); + Notify.LENGTH_LONG, Notify.Style.ERROR).show(CreateKeyEmailFragment.this); return; } } |