From 2cae2065c06e77b1451bf056486eff24eb56ae2c Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Mon, 2 Jul 2018 16:07:24 +0200 Subject: [PATCH] fix date in key choice adapter --- .../keychain/ui/adapter/KeyChoiceAdapter.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyChoiceAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyChoiceAdapter.java index 84a48c00e..de3d18c75 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyChoiceAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyChoiceAdapter.java @@ -210,10 +210,15 @@ public class KeyChoiceAdapter extends FlexibleAdapter { vName.setText(keyInfo.name()); Context context = vCreation.getContext(); - String dateTime = DateUtils.formatDateTime(context, keyInfo.creation(), - DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_TIME | - DateUtils.FORMAT_SHOW_YEAR | DateUtils.FORMAT_ABBREV_MONTH); - vCreation.setText(context.getString(R.string.label_key_created, dateTime)); + if (keyInfo.has_any_secret() || keyInfo.has_duplicate()) { + String dateTime = DateUtils.formatDateTime(context, keyInfo.creation() * 1000, + DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_TIME | + DateUtils.FORMAT_SHOW_YEAR | DateUtils.FORMAT_ABBREV_MONTH); + vCreation.setText(context.getString(R.string.label_key_created, dateTime)); + vCreation.setVisibility(View.VISIBLE); + } else { + vCreation.setVisibility(View.GONE); + } switch (choiceMode) { case Mode.IDLE: {