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

Show fingerprint menu item only if not revoked or expired

Browse Source
This commit is contained in:
Dominik Schürmann
2015-03-04 21:12:52 +01:00
parent 7c8f338297
commit f3af54c814
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,6 +119,9 @@ public class ViewKeyActivity extends BaseActivity implements
private boolean mIsSecret = false; private boolean mIsSecret = false;
private boolean mHasEncrypt = false; private boolean mHasEncrypt = false;
private boolean mIsVerified = false; private boolean mIsVerified = false;
private boolean mIsRevoked = false;
private boolean mIsExpired = false;
private MenuItem mRefreshItem; private MenuItem mRefreshItem;
private boolean mIsRefreshing; private boolean mIsRefreshing;
private Animation mRotate, mRotateSpin; private Animation mRotate, mRotateSpin;
@@ -171,7 +174,7 @@ public class ViewKeyActivity extends BaseActivity implements
} }
}); });
mRotate = AnimationUtils.loadAnimation(this, R.anim.rotate); mRotate = AnimationUtils.loadAnimation(this, R.anim.rotate);
mRotate.setRepeatCount(Animation.INFINITE); mRotate.setRepeatCount(Animation.INFINITE);
mRotate.setAnimationListener(new Animation.AnimationListener() { mRotate.setAnimationListener(new Animation.AnimationListener() {
@Override @Override
@@ -345,7 +348,7 @@ public class ViewKeyActivity extends BaseActivity implements
MenuItem editKey = menu.findItem(R.id.menu_key_view_edit); MenuItem editKey = menu.findItem(R.id.menu_key_view_edit);
editKey.setVisible(mIsSecret); editKey.setVisible(mIsSecret);
MenuItem certifyFingerprint = menu.findItem(R.id.menu_key_view_certify_fingerprint); MenuItem certifyFingerprint = menu.findItem(R.id.menu_key_view_certify_fingerprint);
certifyFingerprint.setVisible(!mIsSecret && !mIsVerified); certifyFingerprint.setVisible(!mIsSecret && !mIsVerified && !mIsExpired && !mIsRevoked);
return true; return true;
} }
@@ -396,12 +399,12 @@ public class ViewKeyActivity extends BaseActivity implements
private void certifyImmediate() { private void certifyImmediate() {
Intent intent = new Intent(this, CertifyKeyActivity.class); Intent intent = new Intent(this, CertifyKeyActivity.class);
intent.putExtra(CertifyKeyActivity.EXTRA_KEY_IDS, new long[]{ mMasterKeyId }); intent.putExtra(CertifyKeyActivity.EXTRA_KEY_IDS, new long[]{mMasterKeyId});
startCertifyIntent(intent); startCertifyIntent(intent);
} }
private void startCertifyIntent (Intent intent) { private void startCertifyIntent(Intent intent) {
// Message is received after signing is done in KeychainIntentService // Message is received after signing is done in KeychainIntentService
KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this) { KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this) {
public void handleMessage(Message message) { public void handleMessage(Message message) {
@@ -807,8 +810,8 @@ public class ViewKeyActivity extends BaseActivity implements
mIsSecret = data.getInt(INDEX_HAS_ANY_SECRET) != 0; mIsSecret = data.getInt(INDEX_HAS_ANY_SECRET) != 0;
mHasEncrypt = data.getInt(INDEX_HAS_ENCRYPT) != 0; mHasEncrypt = data.getInt(INDEX_HAS_ENCRYPT) != 0;
boolean isRevoked = data.getInt(INDEX_IS_REVOKED) > 0; mIsRevoked = data.getInt(INDEX_IS_REVOKED) > 0;
boolean isExpired = data.getInt(INDEX_IS_EXPIRED) != 0; mIsExpired = data.getInt(INDEX_IS_EXPIRED) != 0;
mIsVerified = data.getInt(INDEX_VERIFIED) > 0; mIsVerified = data.getInt(INDEX_VERIFIED) > 0;
// if the refresh animation isn't playing // if the refresh animation isn't playing
@@ -832,7 +835,7 @@ public class ViewKeyActivity extends BaseActivity implements
// Note: order is important // Note: order is important
int color; int color;
if (isRevoked) { if (mIsRevoked) {
mStatusText.setText(R.string.view_key_revoked); mStatusText.setText(R.string.view_key_revoked);
mStatusImage.setVisibility(View.VISIBLE); mStatusImage.setVisibility(View.VISIBLE);
KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText,
@@ -844,7 +847,7 @@ public class ViewKeyActivity extends BaseActivity implements
mActionNfc.setVisibility(View.GONE); mActionNfc.setVisibility(View.GONE);
mFab.setVisibility(View.GONE); mFab.setVisibility(View.GONE);
mQrCodeLayout.setVisibility(View.GONE); mQrCodeLayout.setVisibility(View.GONE);
} else if (isExpired) { } else if (mIsExpired) {
if (mIsSecret) { if (mIsSecret) {
mStatusText.setText(R.string.view_key_expired_secret); mStatusText.setText(R.string.view_key_expired_secret);
} else { } else {
@@ -865,7 +868,7 @@ public class ViewKeyActivity extends BaseActivity implements
mStatusImage.setVisibility(View.GONE); mStatusImage.setVisibility(View.GONE);
color = getResources().getColor(R.color.primary); color = getResources().getColor(R.color.primary);
// reload qr code only if the fingerprint changed // reload qr code only if the fingerprint changed
if ( !mFingerprint.equals(oldFingerprint)) { if (!mFingerprint.equals(oldFingerprint)) {
loadQrCode(mFingerprint); loadQrCode(mFingerprint);
} }
photoTask.execute(mMasterKeyId); photoTask.execute(mMasterKeyId);