diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-01 17:54:53 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-01 17:54:53 +0200 |
| commit | 0bfac9989f801aa93d8bc336307d60b817995688 (patch) | |
| tree | 862660bd27a28a14db7d9fa2a52bebaf41b6f57e /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java | |
| parent | e10cbc54c606563b2d06f083bca17119ca585127 (diff) | |
| parent | f72a07690c257fefb28aed6645ad898fded63a78 (diff) | |
| download | open-keychain-0bfac9989f801aa93d8bc336307d60b817995688.tar.gz open-keychain-0bfac9989f801aa93d8bc336307d60b817995688.tar.bz2 open-keychain-0bfac9989f801aa93d8bc336307d60b817995688.zip | |
Merge branch 'master' into yubikey
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java index e5dbebe01..c2a882fdb 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java @@ -114,7 +114,7 @@ public class SubkeysAdapter extends CursorAdapter { ImageView vEncryptIcon = (ImageView) view.findViewById(R.id.ic_encryptKey); ImageView vSignIcon = (ImageView) view.findViewById(R.id.ic_signKey); ImageView vRevokedKeyIcon = (ImageView) view.findViewById(R.id.ic_revokedKey); - ImageView vEditImage = (ImageView) view.findViewById(R.id.edit_image); + ImageView vEditImage = (ImageView) view.findViewById(R.id.user_id_item_edit_image); long keyId = cursor.getLong(INDEX_KEY_ID); String keyIdStr = PgpKeyHelper.convertKeyIdToHex(keyId); |