diff options
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter')
2 files changed, 8 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java index f322ea980..3fbec118d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java @@ -151,10 +151,10 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> { holder.status.setVisibility(View.GONE); } - LinearLayout ll = (LinearLayout) convertView.findViewById(R.id.list); - ll.removeAllViews(); + LinearLayout userIdsLL = (LinearLayout) convertView.findViewById(R.id.user_ids_list); + userIdsLL.removeAllViews(); if (entry.userIds.size() == 1) { - ll.setVisibility(View.GONE); + userIdsLL.setVisibility(View.GONE); } else { boolean first = true; boolean second = true; @@ -167,12 +167,12 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> { View sep = new View(mActivity); sep.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, 1)); sep.setBackgroundResource(android.R.drawable.divider_horizontal_dark); - ll.addView(sep); + userIdsLL.addView(sep); } TextView uidView = (TextView) mInflater.inflate( R.layout.import_keys_list_entry_user_id, null); uidView.setText(uid); - ll.addView(uidView); + userIdsLL.addView(uidView); second = false; } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java index 0c2f7add2..2210975fe 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java @@ -112,13 +112,14 @@ abstract public class SelectKeyCursorAdapter extends HighlightQueryCursorAdapter h.mainUserId.setText(R.string.user_id_no_name); } if (userIdSplit[1] != null) { + h.mainUserIdRest.setVisibility(View.VISIBLE); h.mainUserIdRest.setText(highlightSearchQuery(userIdSplit[1])); } else { - h.mainUserIdRest.setText(""); + h.mainUserIdRest.setVisibility(View.GONE); } long masterKeyId = cursor.getLong(mIndexMasterKeyId); - h.keyId.setText(PgpKeyHelper.convertKeyIdToHexShort(masterKeyId)); + h.keyId.setText(PgpKeyHelper.convertKeyIdToHex(masterKeyId)); boolean enabled = true; if(cursor.getInt(mIndexRevoked) != 0) { |