aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-10-23 23:31:28 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-10-23 23:31:28 +0200
commit76a1e99d7e30679722ffe2cb0c8c12b048adc369 (patch)
treed488809449e0465d82f187f54d083b042ab930a8 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
parent214b60cd0049c90ea120401646c9d9ae707dc4ad (diff)
parentecfa2288eb58c631900261270a99c8dcf27b4b4d (diff)
downloadopen-keychain-76a1e99d7e30679722ffe2cb0c8c12b048adc369.tar.gz
open-keychain-76a1e99d7e30679722ffe2cb0c8c12b048adc369.tar.bz2
open-keychain-76a1e99d7e30679722ffe2cb0c8c12b048adc369.zip
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java2
1 files changed, 1 insertions, 1 deletions
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 c864c7138..8b6a04b99 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
@@ -152,7 +152,7 @@ abstract public class SelectKeyCursorAdapter extends CursorAdapter {
View view = mInflater.inflate(R.layout.select_key_item, null);
ViewHolderItem holder = new ViewHolderItem();
holder.view = view;
- holder.mainUserId = (TextView) view.findViewById(R.id.mainUserId);
+ holder.mainUserId = (TextView) view.findViewById(R.id.key_list_item_name);
holder.mainUserIdRest = (TextView) view.findViewById(R.id.mainUserIdRest);
holder.keyId = (TextView) view.findViewById(R.id.subkey_item_key_id);
holder.statusIcon = (ImageView) view.findViewById(R.id.status_icon);