diff options
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget')
2 files changed, 4 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java index 76d8fb2dc..f3ead3faa 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java @@ -210,9 +210,7 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView { } public String getPrimary() { - if (mUserId[0] != null && mUserId[2] != null) { - return mUserId[0] + " (" + mUserId[2] + ")"; - } else if (mUserId[0] != null) { + if (mUserId[0] != null) { return mUserId[0]; } else { return mUserId[1]; @@ -220,7 +218,7 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView { } public String getSecondary() { - if (mUserId[0] != null) { + if (mUserId[1] != null) { return mUserId[1]; } else { return getKeyIdHex(); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java index cde22615c..56e01d541 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java @@ -133,7 +133,7 @@ public abstract class KeySpinner extends Spinner implements LoaderManager.Loader inner = new CursorAdapter(null, null, 0) { @Override public View newView(Context context, Cursor cursor, ViewGroup parent) { - return View.inflate(getContext(), R.layout.keyspinner_key, null); + return View.inflate(getContext(), R.layout.keyspinner_item, null); } @Override @@ -210,7 +210,7 @@ public abstract class KeySpinner extends Spinner implements LoaderManager.Loader } else { v = convertView; } - ((TextView) v.findViewById(R.id.keyspinner_key_name)).setText("None"); + ((TextView) v.findViewById(R.id.keyspinner_key_name)).setText(R.string.choice_none); v.findViewById(R.id.keyspinner_key_email).setVisibility(View.GONE); v.findViewById(R.id.keyspinner_key_id).setVisibility(View.GONE); } else { |