cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/manojkhannakm/open-keychain into manojkhannakm-development

Browse Source
This commit is contained in:
Dominik Schürmann
2015-05-04 14:18:10 +02:00
parent b726dea244 ef52a3319a
commit 39c610c2d1
4 changed files with 286 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
View File

@@ -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;
}
}