From c3b1f2dec518d9f06c04cf4f6bf8690f49d886d8 Mon Sep 17 00:00:00 2001
From: Andrea Torlaschi <runnerway@gmail.com>
Date: Sun, 28 Aug 2016 22:33:18 +0200
Subject: [PATCH] ImportKeys: Set real date even if we don't have an expected
 date

---
 .../keychain/ui/adapter/ImportKeysAdapter.java              | 4 +++-
 .../keychain/ui/bindings/ImportKeysBindings.java            | 6 ++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
index 767fd7258..38a602fbf 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
@@ -246,7 +246,9 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
 
         Date expectedDate = entry.getDate();
         Date creationDate = keyRing.getCreationDate();
-        if ((expectedDate != null) && !expectedDate.equals(creationDate)) {
+        if (expectedDate == null) {
+            entry.setDate(creationDate);
+        } else if (!expectedDate.equals(creationDate)) {
             throw new AssertionError("Creation date doesn't match the expected one");
         }
         entry.setKeyId(keyRing.getMasterKeyId());
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/bindings/ImportKeysBindings.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/bindings/ImportKeysBindings.java
index 2dc739e2e..7d0eea5b8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/bindings/ImportKeysBindings.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/bindings/ImportKeysBindings.java
@@ -56,13 +56,11 @@ public class ImportKeysBindings {
     public static void setCreation(TextView textView, Date creationDate, boolean revokedOrExpired) {
         Context context = textView.getContext();
 
-        String text;
+        String text = "";
         if (creationDate != null) {
             text = DateFormat.getDateFormat(context).format(creationDate);
-        } else {
-            Resources resources = context.getResources();
-            text = resources.getString(R.string.unknown);
         }
+
         textView.setText(text);
         textView.setTextColor(ImportKeysBindingsUtils.getColor(context, revokedOrExpired));
     }