From b350fd62f25488daac4e009e571faf521db606f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 3 Jul 2018 21:03:09 +0200 Subject: [PATCH] expired before insecure for status icons in key view --- .../keychain/ui/keyview/ViewKeyActivity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/ViewKeyActivity.java index 061796091..3385c2283 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/ViewKeyActivity.java @@ -737,10 +737,10 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements actionEncryptText.setVisibility(View.INVISIBLE); hideFab(); qrCodeLayout.setVisibility(View.GONE); - } else if (!unifiedKeyInfo.is_secure()) { + } else if (unifiedKeyInfo.is_expired()) { statusImage.setVisibility(View.VISIBLE); KeyFormattingUtils.setStatusImage(this, statusImage, statusText, - State.INSECURE, R.color.icons, true); + State.EXPIRED, R.color.icons, true); // noinspection deprecation, fix requires api level 23 color = getResources().getColor(R.color.key_flag_red); @@ -748,10 +748,10 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements actionEncryptText.setVisibility(View.INVISIBLE); hideFab(); qrCodeLayout.setVisibility(View.GONE); - } else if (unifiedKeyInfo.is_expired()) { + } else if (!unifiedKeyInfo.is_secure()) { statusImage.setVisibility(View.VISIBLE); KeyFormattingUtils.setStatusImage(this, statusImage, statusText, - State.EXPIRED, R.color.icons, true); + State.INSECURE, R.color.icons, true); // noinspection deprecation, fix requires api level 23 color = getResources().getColor(R.color.key_flag_red);