From c0c7c8cc623655265421d1574f16b131abd298ac Mon Sep 17 00:00:00 2001
From: Andrea Torlaschi <runnerway@gmail.com>
Date: Thu, 25 Aug 2016 23:50:10 +0200
Subject: [PATCH] ImportKeys: Check expected creation date with the real one

---
 .../ui/adapter/ImportKeysAdapter.java         | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 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 6d7d1d59d..767fd7258 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
@@ -48,6 +48,7 @@ import org.sufficientlysecure.keychain.util.ParcelableFileCache;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.ViewHolder> implements ImportKeysResultListener {
@@ -224,17 +225,9 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
                         "| isRev: " + keyRing.isRevoked() + "| isExp: " + keyRing.isExpired());
 
                 ImportKeysListEntry entry = mData.get(mCurrent);
-
-                entry.setRevoked(keyRing.isRevoked());
-                entry.setExpired(keyRing.isExpired());
                 entry.setUpdated(result.isOkUpdated());
 
-                entry.setDate(keyRing.getCreationDate());
-                entry.setKeyId(keyRing.getMasterKeyId());
-
-                ArrayList<String> realUserIdsPlusKeybase = keyRing.getUnorderedUserIds();
-                realUserIdsPlusKeybase.addAll(entry.getKeybaseUserIds());
-                entry.setUserIds(realUserIdsPlusKeybase);
+                mergeEntryWithKey(entry, keyRing);
 
                 mKeyStates[mCurrent].mDownloaded = true;
                 changeState(mCurrent, true);
@@ -247,6 +240,22 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
         }
     }
 
+    private void mergeEntryWithKey(ImportKeysListEntry entry, CanonicalizedKeyRing keyRing) {
+        entry.setRevoked(keyRing.isRevoked());
+        entry.setExpired(keyRing.isExpired());
+
+        Date expectedDate = entry.getDate();
+        Date creationDate = keyRing.getCreationDate();
+        if ((expectedDate != null) && !expectedDate.equals(creationDate)) {
+            throw new AssertionError("Creation date doesn't match the expected one");
+        }
+        entry.setKeyId(keyRing.getMasterKeyId());
+
+        ArrayList<String> realUserIdsPlusKeybase = keyRing.getUnorderedUserIds();
+        realUserIdsPlusKeybase.addAll(entry.getKeybaseUserIds());
+        entry.setUserIds(realUserIdsPlusKeybase);
+    }
+
     private class KeyState {
         public boolean mDownloaded = false;
         public boolean mShowed = false;