diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyHealthCardView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyHealthCardView.java index 558cd1842..2474c8f86 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyHealthCardView.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyHealthCardView.java @@ -96,8 +96,8 @@ public class KeyHealthCardView extends CardView implements KeyHealthMvpView, OnC 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, R.drawable.ic_close_black_24dp, R.color.android_red_light), - SPECIAL (R.string.key_health_special_title, R.string.key_health_special_subtitle, - R.drawable.status_signature_unverified_cutout_24dp, R.color.android_orange_light), + BROKEN(R.string.key_health_broken_title, R.string.key_health_broken_subtitle, + 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, R.drawable.ic_check_black_24dp, R.color.android_green_light), 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: setKeyStatus(KeyHealthDisplayStatus.INSECURE); break; - case SPECIAL: - setKeyStatus(KeyHealthDisplayStatus.SPECIAL); + case BROKEN: + setKeyStatus(KeyHealthDisplayStatus.BROKEN); break; case STRIPPED: setKeyStatus(KeyHealthDisplayStatus.STRIPPED); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyHealthPresenter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyHealthPresenter.java index cc90cef9b..ae1acc97c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyHealthPresenter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyHealthPresenter.java @@ -137,7 +137,7 @@ public class KeyHealthPresenter implements LoaderCallbacks { if (!subkeyStatus.keysSign.isEmpty() && subkeyStatus.keysEncrypt.isEmpty()) { SubKeyItem keySign = subkeyStatus.keysSign.get(0); if (!keySign.isValid()) { - return KeyHealthStatus.SPECIAL; + return KeyHealthStatus.BROKEN; } if (keySign.mSecurityProblem != null) { @@ -148,7 +148,7 @@ public class KeyHealthPresenter implements LoaderCallbacks { } if (subkeyStatus.keysSign.isEmpty() || subkeyStatus.keysEncrypt.isEmpty()) { - return KeyHealthStatus.SPECIAL; + return KeyHealthStatus.BROKEN; } SubKeyItem keySign = subkeyStatus.keysSign.get(0); @@ -160,7 +160,7 @@ public class KeyHealthPresenter implements LoaderCallbacks { } if (!keySign.isValid() || !keyEncrypt.isValid()) { - return KeyHealthStatus.SPECIAL; + return KeyHealthStatus.BROKEN; } if (keyCertify.mSecretKeyType == SecretKeyType.GNU_DUMMY @@ -252,7 +252,7 @@ public class KeyHealthPresenter implements LoaderCallbacks { } 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 { diff --git a/OpenKeychain/src/main/res/drawable-hdpi/broken_heart_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/broken_heart_24dp.png new file mode 100644 index 000000000..169f09dbf Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/broken_heart_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/broken_heart_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/broken_heart_24dp.png new file mode 100644 index 000000000..d727a5ba4 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/broken_heart_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/broken_heart_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/broken_heart_24dp.png new file mode 100644 index 000000000..b938c5ce7 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/broken_heart_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/broken_heart_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/broken_heart_24dp.png new file mode 100644 index 000000000..c64b545a5 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/broken_heart_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/broken_heart_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/broken_heart_24dp.png new file mode 100644 index 000000000..e068bf777 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/broken_heart_24dp.png differ diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index e792e4ac2..f0881835d 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1846,8 +1846,8 @@ "This key can\'t be used anymore." "Insecure" "This key is not secure!" - "Special" - "Click for details" + "Defective" + "Click for details" "Healthy (Signing Key)" "Click for details" "Healthy (Stripped)" diff --git a/graphics/drawables/broken_heart.svg b/graphics/drawables/broken_heart.svg new file mode 100644 index 000000000..a1cda629b --- /dev/null +++ b/graphics/drawables/broken_heart.svg @@ -0,0 +1,3 @@ + + + diff --git a/graphics/update-drawables.sh b/graphics/update-drawables.sh index 18ed1b63a..4407315b7 100755 --- a/graphics/update-drawables.sh +++ b/graphics/update-drawables.sh @@ -22,7 +22,7 @@ SRC_DIR=./drawables/ #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 echo $NAME inkscape -w 24 -h 24 -e "$MDPI_DIR/${NAME}_24dp.png" "$SRC_DIR/$NAME.svg"