From 5032453dc29bf0a97328477c5f200698ef459d26 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Sat, 31 Mar 2018 00:12:48 +0200
Subject: [PATCH 1/2] show email address as name instead of '<no name>'

---
 .../ui/adapter/KeySectionedListAdapter.java   | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeySectionedListAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeySectionedListAdapter.java
index 39de7a777..9384cf0b0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeySectionedListAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeySectionedListAdapter.java
@@ -25,6 +25,7 @@ import android.database.MatrixCursor;
 import android.database.MergeCursor;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
+import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
@@ -387,16 +388,21 @@ public class KeySectionedListAdapter extends SectionCursorAdapter<KeySectionedLi
             { // set name and stuff, common to both key types
                 String name = keyItem.getName();
                 String email = keyItem.getEmail();
-                if (name != null) {
+                if (name == null) {
+                    if (email != null) {
+                        mMainUserId.setText(highlighter.highlight(email));
+                        mMainUserIdRest.setVisibility(View.GONE);
+                    } else {
+                        mMainUserId.setText(R.string.user_id_no_name);
+                    }
+                } else {
                     mMainUserId.setText(highlighter.highlight(name));
-                } else {
-                    mMainUserId.setText(R.string.user_id_no_name);
-                }
-                if (email != null) {
-                    mMainUserIdRest.setText(highlighter.highlight(email));
-                    mMainUserIdRest.setVisibility(View.VISIBLE);
-                } else {
-                    mMainUserIdRest.setVisibility(View.GONE);
+                    if (email != null) {
+                        mMainUserIdRest.setText(highlighter.highlight(email));
+                        mMainUserIdRest.setVisibility(View.VISIBLE);
+                    } else {
+                        mMainUserIdRest.setVisibility(View.GONE);
+                    }
                 }
             }
 

From a1da52420e64c8bf8b7a5e6ce80b57e33d4f0d2a Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Sat, 31 Mar 2018 00:13:49 +0200
Subject: [PATCH 2/2] Always show creation time for own keys, and show as "just
 now" for new keys

---
 .../ui/adapter/KeySectionedListAdapter.java   | 34 ++++++++++++++-----
 OpenKeychain/src/main/res/values/strings.xml  |  3 +-
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeySectionedListAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeySectionedListAdapter.java
index 9384cf0b0..c82bc9500 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeySectionedListAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeySectionedListAdapter.java
@@ -63,6 +63,8 @@ public class KeySectionedListAdapter extends SectionCursorAdapter<KeySectionedLi
     private static final short VIEW_SECTION_TYPE_PRIVATE = 0x0;
     private static final short VIEW_SECTION_TYPE_PUBLIC = 0x1;
 
+    private static final long JUST_NOW_TIMESPAN = DateUtils.MINUTE_IN_MILLIS * 5;
+
     private String mQuery;
     private List<Integer> mSelected;
     private KeyListListener mListener;
@@ -483,15 +485,8 @@ public class KeySectionedListAdapter extends SectionCursorAdapter<KeySectionedLi
                 mMainUserId.setTextColor(textColor);
                 mMainUserIdRest.setTextColor(textColor);
 
-                if (keyItem.hasDuplicate()) {
-                    String dateTime = DateUtils.formatDateTime(context,
-                            keyItem.getCreationTime(),
-                            DateUtils.FORMAT_SHOW_DATE
-                                    | DateUtils.FORMAT_SHOW_TIME
-                                    | DateUtils.FORMAT_SHOW_YEAR
-                                    | DateUtils.FORMAT_ABBREV_MONTH);
-                    mCreationDate.setText(context.getString(R.string.label_key_created,
-                            dateTime));
+                if (keyItem.hasDuplicate() || keyItem.isSecret()) {
+                    mCreationDate.setText(getSecretKeyReadableTime(context, keyItem));
                     mCreationDate.setTextColor(textColor);
                     mCreationDate.setVisibility(View.VISIBLE);
                 } else {
@@ -517,6 +512,27 @@ public class KeySectionedListAdapter extends SectionCursorAdapter<KeySectionedLi
             }
         }
 
+        @NonNull
+        private String getSecretKeyReadableTime(Context context, KeyListCursor keyItem) {
+            long creationMillis = keyItem.getCreationTime();
+
+            boolean allowRelativeTimestamp = keyItem.hasDuplicate();
+            if (allowRelativeTimestamp) {
+                long creationAgeMillis = System.currentTimeMillis() - creationMillis;
+                if (creationAgeMillis < JUST_NOW_TIMESPAN) {
+                    return context.getString(R.string.label_key_created_just_now);
+                }
+            }
+
+            String dateTime = DateUtils.formatDateTime(context,
+                    creationMillis,
+                    DateUtils.FORMAT_SHOW_DATE
+                            | DateUtils.FORMAT_SHOW_TIME
+                            | DateUtils.FORMAT_SHOW_YEAR
+                            | DateUtils.FORMAT_ABBREV_MONTH);
+            return context.getString(R.string.label_key_created, dateTime);
+        }
+
         @Override
         public void onClick(View v) {
             int pos = getAdapterPosition();
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 7bfe86ba9..1f2946c36 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -167,7 +167,8 @@
     <string name="label_keyservers">"Manage OpenPGP keyservers"</string>
     <string name="label_key_id">"Key ID"</string>
     <string name="label_key_id_colon">"Key ID:"</string>
-    <string name="label_key_created">"Key created %s"</string>
+    <string name="label_key_created">"Created %s"</string>
+    <string name="label_key_created_just_now">"Created just now"</string>
     <string name="label_key_type">"Type"</string>
     <string name="label_creation">"Creation"</string>
     <string name="label_creation_colon">"Creation:"</string>