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

Merge branch 'issue_1846' of https://github.com/daquexian/open-keychain into daquexian-issue_1846

Browse Source
This commit is contained in:
Dominik Schürmann
2017-01-27 00:11:11 +01:00
parent 72d62a847f f26a355bd6
commit 732aa0de60
16 changed files with 189 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/adapter/SelectEncryptKeyAdapter.java
View File

@@ -181,14 +181,15 @@ public class SelectEncryptKeyAdapter extends KeyCursorAdapter<SelectEncryptKeyAd
Context context = itemView.getContext();
{ // set name and stuff, common to both key types
OpenPgpUtils.UserId userIdSplit = cursor.getUserId();
if (userIdSplit.name != null) {
mUserIdText.setText(highlighter.highlight(userIdSplit.name));
String name = cursor.getName();
String email = cursor.getEmail();
if (name != null) {
mUserIdText.setText(highlighter.highlight(name));
} else {
mUserIdText.setText(R.string.user_id_no_name);
}
if (userIdSplit.email != null) {
mUserIdRestText.setText(highlighter.highlight(userIdSplit.email));
if (email != null) {
mUserIdRestText.setText(highlighter.highlight(email));
mUserIdRestText.setVisibility(View.VISIBLE);
} else {
mUserIdRestText.setVisibility(View.GONE);

11
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/adapter/SelectSignKeyAdapter.java
View File

@@ -141,14 +141,15 @@ public class SelectSignKeyAdapter extends KeyCursorAdapter<CursorAdapter.KeyCurs
Context context = itemView.getContext();
{ // set name and stuff, common to both key types
OpenPgpUtils.UserId userIdSplit = cursor.getUserId();
if (userIdSplit.name != null) {
mUserIdText.setText(highlighter.highlight(userIdSplit.name));
String name = cursor.getName();
String email = cursor.getEmail();
if (name != null) {
mUserIdText.setText(highlighter.highlight(name));
} else {
mUserIdText.setText(R.string.user_id_no_name);
}
if (userIdSplit.email != null) {
mUserIdRestText.setText(highlighter.highlight(userIdSplit.email));
if (email != null) {
mUserIdRestText.setText(highlighter.highlight(email));
mUserIdRestText.setVisibility(View.VISIBLE);
} else {
mUserIdRestText.setVisibility(View.GONE);