diff --git a/app/src/main/java/com/keepassdroid/dialogs/UnavailableFeatureDialogFragment.java b/app/src/main/java/com/keepassdroid/dialogs/UnavailableFeatureDialogFragment.java index da9b01659..88456e914 100644 --- a/app/src/main/java/com/keepassdroid/dialogs/UnavailableFeatureDialogFragment.java +++ b/app/src/main/java/com/keepassdroid/dialogs/UnavailableFeatureDialogFragment.java @@ -45,10 +45,10 @@ public class UnavailableFeatureDialogFragment extends DialogFragment { SpannableStringBuilder message = new SpannableStringBuilder(); message.append(getString(R.string.unavailable_feature_text)) - .append("\n"); + .append("\n\n"); if(Build.VERSION.SDK_INT < minVersionRequired) { message.append(getString(R.string.unavailable_feature_version, - androidNameFromApiNumber(Build.VERSION.SDK_INT), + androidNameFromApiNumber(Build.VERSION.SDK_INT, Build.VERSION.RELEASE), androidNameFromApiNumber(minVersionRequired))); message.append("\n\n") .append(Html.fromHtml("CodeNames")); @@ -64,8 +64,13 @@ public class UnavailableFeatureDialogFragment extends DialogFragment { } private String androidNameFromApiNumber(int apiNumber) { + return androidNameFromApiNumber(apiNumber, ""); + } + + private String androidNameFromApiNumber(int apiNumber, String releaseVersion) { StringBuilder builder = new StringBuilder(); Field[] fields = Build.VERSION_CODES.class.getFields(); + String apiName = ""; for (Field field : fields) { String fieldName = field.getName(); int fieldValue = -1; @@ -79,12 +84,41 @@ public class UnavailableFeatureDialogFragment extends DialogFragment { e.printStackTrace(); } if (fieldValue == apiNumber) { - builder.append(fieldName).append(" "); - break; + apiName = fieldName; } } - builder.append("(API "); - builder.append(apiNumber).append(")"); + if (apiName.isEmpty()) { + String[] mapper = new String[]{ + "ANDROID BASE", "ANDROID BASE 1.1", "CUPCAKE", "DONUT", + "ECLAIR", "ECLAIR_0_1", "ECLAIR_MR1", "FROYO", + "GINGERBREAD", "GINGERBREAD_MR1", "HONEYCOMB", "HONEYCOMB_MR1", + "HONEYCOMB_MR2", "ICE_CREAM_SANDWICH", "ICE_CREAM_SANDWICH_MR1", "JELLY_BEAN", + "JELLY_BEAN", "JELLY_BEAN", "KITKAT", "KITKAT", + "LOLLIPOOP", "LOLLIPOOP_MR1", "MARSHMALLOW", "NOUGAT", + "NOUGAT", "OREO", "OREO"}; + int index = apiNumber - 1; + apiName = index < mapper.length ? mapper[index] : "UNKNOWN_VERSION"; + } + if (releaseVersion.isEmpty()) { + String[] versions = new String[]{ + "1.0", "1.1", "1.5", "1.6", + "2.0", "2.0.1", "2.1", "2.2.X", + "2.3", "2.3.3", "3.0", "3.1", + "3.2.0", "4.0.1", "4.0.3", "4.1.0", + "4.2.0", "4.3.0", "4.4", "4.4", + "5.0", "5.1", "6.0", "7.0", + "7.1", "8.0.0", "8.1.0"}; + int index = apiNumber - 1; + releaseVersion = index < versions.length ? versions[index] : "UNKNOWN_VERSION"; + } + + builder.append("\n\t"); + if (!apiName.isEmpty()) + builder.append(apiName).append(" "); + if (!releaseVersion.isEmpty()) + builder.append(releaseVersion).append(" "); + builder.append("(API ").append(apiNumber).append(")"); + builder.append("\n"); return builder.toString(); } }