From 10ce910164553e9a19d308df6065aa0a17569624 Mon Sep 17 00:00:00 2001
From: Andrea Torlaschi <runnerway@gmail.com>
Date: Tue, 2 Aug 2016 22:40:26 +0200
Subject: [PATCH] ImportKeys: Fix key preview when already downloaded

---
 .../keychain/provider/ProviderHelper.java                 | 8 ++++----
 .../keychain/ui/adapter/ImportKeysAdapter.java            | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index 1340cc1bf..b7c896401 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -945,6 +945,7 @@ public class ProviderHelper {
                 if (canPublicRing == null) {
                     return new SaveKeyringResult(SaveKeyringResult.RESULT_ERROR, mLog, null);
                 }
+                if (canKeyRings != null) canKeyRings.add(canPublicRing);
 
                 // Early breakout if nothing changed
                 if (Arrays.hashCode(publicRing.getEncoded())
@@ -960,7 +961,7 @@ public class ProviderHelper {
                 if (canPublicRing == null) {
                     return new SaveKeyringResult(SaveKeyringResult.RESULT_ERROR, mLog, null);
                 }
-
+                if (canKeyRings != null) canKeyRings.add(canPublicRing);
             }
 
             // If there is a secret key, merge new data (if any) and save the key for later
@@ -1001,7 +1002,6 @@ public class ProviderHelper {
             if (!skipSave) {
                 result = saveCanonicalizedPublicKeyRing(canPublicRing, progress, canSecretRing != null);
             }
-            if (canKeyRings != null) canKeyRings.add(canPublicRing);
 
             // Save the saved keyring (if any)
             if (canSecretRing != null) {
@@ -1071,6 +1071,7 @@ public class ProviderHelper {
                 if (canSecretRing == null) {
                     return new SaveKeyringResult(SaveKeyringResult.RESULT_ERROR, mLog, null);
                 }
+                if (canKeyRings != null) canKeyRings.add(canSecretRing);
 
                 // Early breakout if nothing changed
                 if (Arrays.hashCode(secretRing.getEncoded())
@@ -1102,7 +1103,7 @@ public class ProviderHelper {
                         return new SaveKeyringResult(SaveKeyringResult.RESULT_ERROR, mLog, null);
                     }
                 }
-
+                if (canKeyRings != null) canKeyRings.add(canSecretRing);
             }
 
             // Merge new data into public keyring as well, if there is any
@@ -1143,7 +1144,6 @@ public class ProviderHelper {
             if (!skipSave) {
                 result = saveCanonicalizedSecretKeyRing(canSecretRing);
             }
-            if (canKeyRings != null) canKeyRings.add(canSecretRing);
 
             return new SaveKeyringResult(result, mLog, canSecretRing);
 
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 4ba2099b3..f7526a948 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
@@ -321,7 +321,8 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
                 mKeyStates[mCurrent].mDownloaded = true;
                 changeState(mCurrent, true);
             } else {
-                throw new RuntimeException("getKey retrieved more than one key.");
+                throw new RuntimeException("getKey retrieved more than one key ("
+                        + canKeyRings.size() + ")");
             }
         }
     }