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

remove revoke/expired/insecure status text from toolbar

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-04-25 16:25:59 +02:00
parent 2f57c52d52
commit 542e0733cb
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -966,10 +966,24 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
} }
}; };
boolean showStatusText = mIsSecure && !mIsExpired && !mIsRevoked;
if (showStatusText) {
mStatusText.setVisibility(View.VISIBLE);
if (mIsSecret) {
mStatusText.setText(R.string.view_key_my_key);
} else if (mIsVerified) {
mStatusText.setText(R.string.view_key_verified);
} else {
mStatusText.setText(R.string.view_key_unverified);
}
} else {
mStatusText.setVisibility(View.GONE);
}
// Note: order is important // Note: order is important
int color; int color;
if (mIsRevoked) { if (mIsRevoked) {
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,
State.REVOKED, R.color.icons, true); State.REVOKED, R.color.icons, true);
@@ -982,7 +996,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
hideFab(); hideFab();
mQrCodeLayout.setVisibility(View.GONE); mQrCodeLayout.setVisibility(View.GONE);
} else if (!mIsSecure) { } else if (!mIsSecure) {
mStatusText.setText(R.string.view_key_insecure);
mStatusImage.setVisibility(View.VISIBLE); mStatusImage.setVisibility(View.VISIBLE);
KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText,
State.INSECURE, R.color.icons, true); State.INSECURE, R.color.icons, true);
@@ -995,11 +1008,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
hideFab(); hideFab();
mQrCodeLayout.setVisibility(View.GONE); mQrCodeLayout.setVisibility(View.GONE);
} else if (mIsExpired) { } else if (mIsExpired) {
if (mIsSecret) {
mStatusText.setText(R.string.view_key_expired_secret);
} else {
mStatusText.setText(R.string.view_key_expired);
}
mStatusImage.setVisibility(View.VISIBLE); mStatusImage.setVisibility(View.VISIBLE);
KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText,
State.EXPIRED, R.color.icons, true); State.EXPIRED, R.color.icons, true);
@@ -1012,7 +1020,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
hideFab(); hideFab();
mQrCodeLayout.setVisibility(View.GONE); mQrCodeLayout.setVisibility(View.GONE);
} else if (mIsSecret) { } else if (mIsSecret) {
mStatusText.setText(R.string.view_key_my_key);
mStatusImage.setVisibility(View.GONE); mStatusImage.setVisibility(View.GONE);
// noinspection deprecation, fix requires api level 23 // noinspection deprecation, fix requires api level 23
color = getResources().getColor(R.color.key_flag_green); color = getResources().getColor(R.color.key_flag_green);

4
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -823,10 +823,6 @@
<string name="create_key_yubi_key_algorithm_auth_text">Authentication key</string> <string name="create_key_yubi_key_algorithm_auth_text">Authentication key</string>
<!-- View key --> <!-- View key -->
<string name="view_key_revoked">"Revoked: Key must not be used anymore!"</string>
<string name="view_key_insecure">"Insecure: Key must not be used anymore!"</string>
<string name="view_key_expired">"Expired: The contact needs to extend the key's validity!"</string>
<string name="view_key_expired_secret">"Expired: You can extend the keys validity by editing it!"</string>
<string name="view_key_my_key">"My Key"</string> <string name="view_key_my_key">"My Key"</string>
<string name="view_key_verified">"Confirmed Key"</string> <string name="view_key_verified">"Confirmed Key"</string>
<string name="view_key_unverified">"Unconfirmed: Scan QR Code to confirm key!"</string> <string name="view_key_unverified">"Unconfirmed: Scan QR Code to confirm key!"</string>