diff options
Diffstat (limited to 'OpenKeychain')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java | 19 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/drawable-hdpi/key_certify_primary_ok_depth0.png | bin | 0 -> 623 bytes | |||
-rw-r--r-- | OpenKeychain/src/main/res/drawable-hdpi/key_certify_primary_ok_self.png | bin | 0 -> 473 bytes | |||
-rw-r--r-- | OpenKeychain/src/main/res/drawable-mdpi/key_certify_primary_ok_depth0.png | bin | 0 -> 505 bytes | |||
-rw-r--r-- | OpenKeychain/src/main/res/drawable-mdpi/key_certify_primary_ok_self.png | bin | 0 -> 361 bytes | |||
-rw-r--r-- | OpenKeychain/src/main/res/drawable-xhdpi/key_certify_primary_ok_depth0.png | bin | 0 -> 722 bytes | |||
-rw-r--r-- | OpenKeychain/src/main/res/drawable-xhdpi/key_certify_primary_ok_self.png | bin | 0 -> 623 bytes | |||
-rw-r--r-- | OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_primary_ok_depth0.png | bin | 0 -> 889 bytes | |||
-rw-r--r-- | OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_primary_ok_self.png | bin | 0 -> 890 bytes | |||
-rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_userids_item.xml | 6 |
10 files changed, 8 insertions, 17 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java index 05f8f8860..64452e8b4 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java @@ -111,7 +111,6 @@ public class ViewKeyUserIdsAdapter extends CursorAdapter implements AdapterView. TextView vAddress = (TextView) view.findViewById(R.id.address); TextView vComment = (TextView) view.findViewById(R.id.comment); ImageView vVerified = (ImageView) view.findViewById(R.id.certified); - ImageView vPrimaryUserIdIcon = (ImageView) view.findViewById(R.id.primary_user_id_icon); String[] userId = PgpKeyHelper.splitUserId(cursor.getString(mIndexUserId)); if (userId[0] != null) { @@ -133,17 +132,11 @@ public class ViewKeyUserIdsAdapter extends CursorAdapter implements AdapterView. } // show small star icon for primary user ids - if (cursor.getInt(mIsPrimary) > 0) { - vPrimaryUserIdIcon.setVisibility(View.VISIBLE); - } else { - vPrimaryUserIdIcon.setVisibility(View.GONE); - } + boolean isPrimary = cursor.getInt(mIsPrimary) != 0; if (cursor.getInt(mIsRevoked) > 0) { - // no star icon for revoked user ids! - vPrimaryUserIdIcon.setVisibility(View.GONE); - // set revocation icon + // set revocation icon (can this even be primary?) vVerified.setImageResource(R.drawable.key_certify_revoke); // disable and strike through text for revoked user ids @@ -158,10 +151,14 @@ public class ViewKeyUserIdsAdapter extends CursorAdapter implements AdapterView. int verified = cursor.getInt(mVerifiedId); switch (verified) { case Certs.VERIFIED_SECRET: - vVerified.setImageResource(R.drawable.key_certify_ok_depth0); + vVerified.setImageResource(isPrimary + ? R.drawable.key_certify_primary_ok_depth0 + : R.drawable.key_certify_ok_depth0); break; case Certs.VERIFIED_SELF: - vVerified.setImageResource(R.drawable.key_certify_ok_self); + vVerified.setImageResource(isPrimary + ? R.drawable.key_certify_primary_ok_self + : R.drawable.key_certify_ok_self); break; default: vVerified.setImageResource(R.drawable.key_certify_error); diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_certify_primary_ok_depth0.png b/OpenKeychain/src/main/res/drawable-hdpi/key_certify_primary_ok_depth0.png Binary files differnew file mode 100644 index 000000000..c07b91304 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/key_certify_primary_ok_depth0.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_certify_primary_ok_self.png b/OpenKeychain/src/main/res/drawable-hdpi/key_certify_primary_ok_self.png Binary files differnew file mode 100644 index 000000000..a1804b2c1 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/key_certify_primary_ok_self.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_certify_primary_ok_depth0.png b/OpenKeychain/src/main/res/drawable-mdpi/key_certify_primary_ok_depth0.png Binary files differnew file mode 100644 index 000000000..e61c1bbb2 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/key_certify_primary_ok_depth0.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_certify_primary_ok_self.png b/OpenKeychain/src/main/res/drawable-mdpi/key_certify_primary_ok_self.png Binary files differnew file mode 100644 index 000000000..11a25b504 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/key_certify_primary_ok_self.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_primary_ok_depth0.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_primary_ok_depth0.png Binary files differnew file mode 100644 index 000000000..f3e8bf0f3 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_primary_ok_depth0.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_primary_ok_self.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_primary_ok_self.png Binary files differnew file mode 100644 index 000000000..40ca1572c --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_primary_ok_self.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_primary_ok_depth0.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_primary_ok_depth0.png Binary files differnew file mode 100644 index 000000000..a19eeae90 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_primary_ok_depth0.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_primary_ok_self.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_primary_ok_self.png Binary files differnew file mode 100644 index 000000000..44754152f --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_primary_ok_self.png diff --git a/OpenKeychain/src/main/res/layout/view_key_userids_item.xml b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml index 5552757ef..a6d147cc1 100644 --- a/OpenKeychain/src/main/res/layout/view_key_userids_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml @@ -27,12 +27,6 @@ android:id="@+id/certified" android:src="@drawable/key_certify_ok_self" /> - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:visibility="gone" - android:id="@+id/primary_user_id_icon" - android:src="@drawable/ic_action_important_small" /> </LinearLayout> <LinearLayout |