cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

expired before insecure for status icons in key view

Browse Source
This commit is contained in:
Dominik Schürmann
2018-07-03 21:03:09 +02:00
committed by Vincent Breitmoser
parent d5a2c6f42d
commit b350fd62f2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/ViewKeyActivity.java
View File

@@ -737,10 +737,10 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
actionEncryptText.setVisibility(View.INVISIBLE); actionEncryptText.setVisibility(View.INVISIBLE);
hideFab(); hideFab();
qrCodeLayout.setVisibility(View.GONE); qrCodeLayout.setVisibility(View.GONE);
} else if (!unifiedKeyInfo.is_secure()) { } else if (unifiedKeyInfo.is_expired()) {
statusImage.setVisibility(View.VISIBLE); statusImage.setVisibility(View.VISIBLE);
KeyFormattingUtils.setStatusImage(this, statusImage, statusText, KeyFormattingUtils.setStatusImage(this, statusImage, statusText,
State.INSECURE, R.color.icons, true); State.EXPIRED, R.color.icons, true);
// noinspection deprecation, fix requires api level 23 // noinspection deprecation, fix requires api level 23
color = getResources().getColor(R.color.key_flag_red); color = getResources().getColor(R.color.key_flag_red);
@@ -748,10 +748,10 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
actionEncryptText.setVisibility(View.INVISIBLE); actionEncryptText.setVisibility(View.INVISIBLE);
hideFab(); hideFab();
qrCodeLayout.setVisibility(View.GONE); qrCodeLayout.setVisibility(View.GONE);
} else if (unifiedKeyInfo.is_expired()) { } else if (!unifiedKeyInfo.is_secure()) {
statusImage.setVisibility(View.VISIBLE); statusImage.setVisibility(View.VISIBLE);
KeyFormattingUtils.setStatusImage(this, statusImage, statusText, KeyFormattingUtils.setStatusImage(this, statusImage, statusText,
State.EXPIRED, R.color.icons, true); State.INSECURE, R.color.icons, true);
// noinspection deprecation, fix requires api level 23 // noinspection deprecation, fix requires api level 23
color = getResources().getColor(R.color.key_flag_red); color = getResources().getColor(R.color.key_flag_red);