rename Special key health status to Defective
This commit is contained in:
parent
0332b2f984
commit
2f57c52d52
|
@ -96,8 +96,8 @@ public class KeyHealthCardView extends CardView implements KeyHealthMvpView, OnC
|
||||||
R.drawable.status_signature_expired_cutout_24dp, R.color.android_red_light),
|
R.drawable.status_signature_expired_cutout_24dp, R.color.android_red_light),
|
||||||
INSECURE (R.string.key_health_insecure_title, R.string.key_health_insecure_subtitle,
|
INSECURE (R.string.key_health_insecure_title, R.string.key_health_insecure_subtitle,
|
||||||
R.drawable.ic_close_black_24dp, R.color.android_red_light),
|
R.drawable.ic_close_black_24dp, R.color.android_red_light),
|
||||||
SPECIAL (R.string.key_health_special_title, R.string.key_health_special_subtitle,
|
BROKEN(R.string.key_health_broken_title, R.string.key_health_broken_subtitle,
|
||||||
R.drawable.status_signature_unverified_cutout_24dp, R.color.android_orange_light),
|
R.drawable.broken_heart_24dp, R.color.android_red_light),
|
||||||
SIGN_ONLY (R.string.key_health_sign_only_title, R.string.key_health_sign_only_subtitle,
|
SIGN_ONLY (R.string.key_health_sign_only_title, R.string.key_health_sign_only_subtitle,
|
||||||
R.drawable.ic_check_black_24dp, R.color.android_green_light),
|
R.drawable.ic_check_black_24dp, R.color.android_green_light),
|
||||||
STRIPPED (R.string.key_health_stripped_title, R.string.key_health_stripped_subtitle,
|
STRIPPED (R.string.key_health_stripped_title, R.string.key_health_stripped_subtitle,
|
||||||
|
@ -139,8 +139,8 @@ public class KeyHealthCardView extends CardView implements KeyHealthMvpView, OnC
|
||||||
case INSECURE:
|
case INSECURE:
|
||||||
setKeyStatus(KeyHealthDisplayStatus.INSECURE);
|
setKeyStatus(KeyHealthDisplayStatus.INSECURE);
|
||||||
break;
|
break;
|
||||||
case SPECIAL:
|
case BROKEN:
|
||||||
setKeyStatus(KeyHealthDisplayStatus.SPECIAL);
|
setKeyStatus(KeyHealthDisplayStatus.BROKEN);
|
||||||
break;
|
break;
|
||||||
case STRIPPED:
|
case STRIPPED:
|
||||||
setKeyStatus(KeyHealthDisplayStatus.STRIPPED);
|
setKeyStatus(KeyHealthDisplayStatus.STRIPPED);
|
||||||
|
|
|
@ -137,7 +137,7 @@ public class KeyHealthPresenter implements LoaderCallbacks<KeySubkeyStatus> {
|
||||||
if (!subkeyStatus.keysSign.isEmpty() && subkeyStatus.keysEncrypt.isEmpty()) {
|
if (!subkeyStatus.keysSign.isEmpty() && subkeyStatus.keysEncrypt.isEmpty()) {
|
||||||
SubKeyItem keySign = subkeyStatus.keysSign.get(0);
|
SubKeyItem keySign = subkeyStatus.keysSign.get(0);
|
||||||
if (!keySign.isValid()) {
|
if (!keySign.isValid()) {
|
||||||
return KeyHealthStatus.SPECIAL;
|
return KeyHealthStatus.BROKEN;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (keySign.mSecurityProblem != null) {
|
if (keySign.mSecurityProblem != null) {
|
||||||
|
@ -148,7 +148,7 @@ public class KeyHealthPresenter implements LoaderCallbacks<KeySubkeyStatus> {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (subkeyStatus.keysSign.isEmpty() || subkeyStatus.keysEncrypt.isEmpty()) {
|
if (subkeyStatus.keysSign.isEmpty() || subkeyStatus.keysEncrypt.isEmpty()) {
|
||||||
return KeyHealthStatus.SPECIAL;
|
return KeyHealthStatus.BROKEN;
|
||||||
}
|
}
|
||||||
|
|
||||||
SubKeyItem keySign = subkeyStatus.keysSign.get(0);
|
SubKeyItem keySign = subkeyStatus.keysSign.get(0);
|
||||||
|
@ -160,7 +160,7 @@ public class KeyHealthPresenter implements LoaderCallbacks<KeySubkeyStatus> {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!keySign.isValid() || !keyEncrypt.isValid()) {
|
if (!keySign.isValid() || !keyEncrypt.isValid()) {
|
||||||
return KeyHealthStatus.SPECIAL;
|
return KeyHealthStatus.BROKEN;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (keyCertify.mSecretKeyType == SecretKeyType.GNU_DUMMY
|
if (keyCertify.mSecretKeyType == SecretKeyType.GNU_DUMMY
|
||||||
|
@ -252,7 +252,7 @@ public class KeyHealthPresenter implements LoaderCallbacks<KeySubkeyStatus> {
|
||||||
}
|
}
|
||||||
|
|
||||||
enum KeyHealthStatus {
|
enum KeyHealthStatus {
|
||||||
OK, DIVERT, REVOKED, EXPIRED, INSECURE, SIGN_ONLY, STRIPPED, PARTIAL_STRIPPED, SPECIAL
|
OK, DIVERT, REVOKED, EXPIRED, INSECURE, SIGN_ONLY, STRIPPED, PARTIAL_STRIPPED, BROKEN
|
||||||
}
|
}
|
||||||
|
|
||||||
interface KeyHealthMvpView {
|
interface KeyHealthMvpView {
|
||||||
|
|
BIN
OpenKeychain/src/main/res/drawable-hdpi/broken_heart_24dp.png
Normal file
BIN
OpenKeychain/src/main/res/drawable-hdpi/broken_heart_24dp.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 694 B |
BIN
OpenKeychain/src/main/res/drawable-mdpi/broken_heart_24dp.png
Normal file
BIN
OpenKeychain/src/main/res/drawable-mdpi/broken_heart_24dp.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 495 B |
BIN
OpenKeychain/src/main/res/drawable-xhdpi/broken_heart_24dp.png
Normal file
BIN
OpenKeychain/src/main/res/drawable-xhdpi/broken_heart_24dp.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 860 B |
BIN
OpenKeychain/src/main/res/drawable-xxhdpi/broken_heart_24dp.png
Normal file
BIN
OpenKeychain/src/main/res/drawable-xxhdpi/broken_heart_24dp.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.3 KiB |
BIN
OpenKeychain/src/main/res/drawable-xxxhdpi/broken_heart_24dp.png
Normal file
BIN
OpenKeychain/src/main/res/drawable-xxxhdpi/broken_heart_24dp.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.7 KiB |
|
@ -1846,8 +1846,8 @@
|
||||||
<string name="key_health_revoked_subtitle">"This key can\'t be used anymore."</string>
|
<string name="key_health_revoked_subtitle">"This key can\'t be used anymore."</string>
|
||||||
<string name="key_health_insecure_title">"Insecure"</string>
|
<string name="key_health_insecure_title">"Insecure"</string>
|
||||||
<string name="key_health_insecure_subtitle">"This key is not secure!"</string>
|
<string name="key_health_insecure_subtitle">"This key is not secure!"</string>
|
||||||
<string name="key_health_special_title">"Special"</string>
|
<string name="key_health_broken_title">"Defective"</string>
|
||||||
<string name="key_health_special_subtitle">"Click for details"</string>
|
<string name="key_health_broken_subtitle">"Click for details"</string>
|
||||||
<string name="key_health_sign_only_title">"Healthy (Signing Key)"</string>
|
<string name="key_health_sign_only_title">"Healthy (Signing Key)"</string>
|
||||||
<string name="key_health_sign_only_subtitle">"Click for details"</string>
|
<string name="key_health_sign_only_subtitle">"Click for details"</string>
|
||||||
<string name="key_health_stripped_title">"Healthy (Stripped)"</string>
|
<string name="key_health_stripped_title">"Healthy (Stripped)"</string>
|
||||||
|
|
3
graphics/drawables/broken_heart.svg
Normal file
3
graphics/drawables/broken_heart.svg
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
<svg style="width:24px;height:24px" viewBox="0 0 24 24">
|
||||||
|
<path fill="#000000" d="M12,21.35L10.55,20.03C5.4,15.36 2,12.27 2,8.5C2,5.41 4.42,3 7.5,3C8.17,3 8.82,3.12 9.44,3.33L13,9.35L9,14.35L12,21.35V21.35M16.5,3C19.58,3 22,5.41 22,8.5C22,12.27 18.6,15.36 13.45,20.03L12,21.35L11,14.35L15.5,9.35L12.85,4.27C13.87,3.47 15.17,3 16.5,3Z" />
|
||||||
|
</svg>
|
After Width: | Height: | Size: 348 B |
|
@ -22,7 +22,7 @@ SRC_DIR=./drawables/
|
||||||
#inkscape -w 512 -h 512 -e "$PLAY_DIR/$NAME.png" $NAME.svg
|
#inkscape -w 512 -h 512 -e "$PLAY_DIR/$NAME.png" $NAME.svg
|
||||||
|
|
||||||
|
|
||||||
for NAME in "ic_cloud_search" "ic_action_encrypt_file" "ic_action_encrypt_text" "ic_action_verified_cutout" "ic_action_encrypt_copy" "ic_action_encrypt_paste" "ic_action_encrypt_save" "ic_action_encrypt_share" "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "key_flag_authenticate" "key_flag_certify" "key_flag_encrypt" "key_flag_sign" "yubi_icon" "ic_stat_notify" "status_signature_verified_inner" "link" "octo_link"
|
for NAME in "broken_heart" "ic_cloud_search" "ic_action_encrypt_file" "ic_action_encrypt_text" "ic_action_verified_cutout" "ic_action_encrypt_copy" "ic_action_encrypt_paste" "ic_action_encrypt_save" "ic_action_encrypt_share" "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "key_flag_authenticate" "key_flag_certify" "key_flag_encrypt" "key_flag_sign" "yubi_icon" "ic_stat_notify" "status_signature_verified_inner" "link" "octo_link"
|
||||||
do
|
do
|
||||||
echo $NAME
|
echo $NAME
|
||||||
inkscape -w 24 -h 24 -e "$MDPI_DIR/${NAME}_24dp.png" "$SRC_DIR/$NAME.svg"
|
inkscape -w 24 -h 24 -e "$MDPI_DIR/${NAME}_24dp.png" "$SRC_DIR/$NAME.svg"
|
||||||
|
|
Loading…
Reference in a new issue