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

rename Special key health status to Defective

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-04-25 15:00:11 +02:00
parent 0332b2f984
commit 2f57c52d52
10 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyHealthCardView.java
View File

@@ -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);

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyHealthPresenter.java
View File

@@ -137,7 +137,7 @@ public class KeyHealthPresenter implements LoaderCallbacks<KeySubkeyStatus> {
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<KeySubkeyStatus> {
}
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<KeySubkeyStatus> {
}
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<KeySubkeyStatus> {
}
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 {