From 1a60c2156d2cf8d46d375eea933160355fa63b95 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Mon, 24 Apr 2017 21:28:43 +0200 Subject: [PATCH] add fallback if security problem is unknown --- .../keychain/ui/widget/KeyHealthCardView.java | 6 ++++++ OpenKeychain/src/main/res/values/strings.xml | 3 +++ 2 files changed, 9 insertions(+) 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 a62db21f6..558cd1842 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 @@ -38,6 +38,7 @@ import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.SecurityProblem.InsecureBitStrength; import org.sufficientlysecure.keychain.pgp.SecurityProblem.KeySecurityProblem; import org.sufficientlysecure.keychain.pgp.SecurityProblem.NotWhitelistedCurve; +import org.sufficientlysecure.keychain.pgp.SecurityProblem.UnidentifiedKeyProblem; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; import org.sufficientlysecure.keychain.ui.widget.KeyHealthPresenter.KeyHealthClickListener; import org.sufficientlysecure.keychain.ui.widget.KeyHealthPresenter.KeyHealthMvpView; @@ -173,6 +174,11 @@ public class KeyHealthCardView extends CardView implements KeyHealthMvpView, OnC String curveName = KeyFormattingUtils.getCurveInfo(getContext(), notWhitelistedCurve.curveOid); vInsecureProblem.setText(getResources().getString(R.string.key_insecure_unknown_curve_problem, curveName)); vInsecureSolution.setText(R.string.key_insecure_unknown_curve_solution); + } else if (securityProblem instanceof UnidentifiedKeyProblem) { + vInsecureProblem.setText(R.string.key_insecure_unidentified_problem); + vInsecureSolution.setText(R.string.key_insecure_unknown_curve_solution); + } else { + throw new IllegalArgumentException("all subclasses of KeySecurityProblem must be handled!"); } } diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index bc64953f6..e792e4ac2 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1861,6 +1861,9 @@ "This key uses the %1$s algorithm, which is not whitelisted." "This key can\'t be upgraded. For secure communication, the owner must generate a new key." + "There is an unidentified problem with this key." + "Please submit a bug report." + "This key expired on %1$s."