From 9e1a0c2c0a6de82425b3e4715d700a7361a1e328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sat, 4 Oct 2014 18:59:59 +0200
Subject: Pass imported master key ids via result parcel

---
 .../sufficientlysecure/keychain/pgp/PgpImportExport.java   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
index c3320ed6a..964c535dd 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
@@ -120,10 +120,12 @@ public class PgpImportExport {
         // If there aren't even any keys, do nothing here.
         if (entries == null || !entries.hasNext()) {
             return new ImportKeyResult(
-                    ImportKeyResult.RESULT_FAIL_NOTHING, mProviderHelper.getLog(), 0, 0, 0, 0);
+                    ImportKeyResult.RESULT_FAIL_NOTHING, mProviderHelper.getLog(), 0, 0, 0, 0,
+                    new long[]{});
         }
 
         int newKeys = 0, oldKeys = 0, badKeys = 0, secret = 0;
+        ArrayList<Long> importedMasterKeyIds = new ArrayList<Long>();
 
         int position = 0;
         double progSteps = 100.0 / num;
@@ -165,11 +167,13 @@ public class PgpImportExport {
                     badKeys += 1;
                 } else if (result.updated()) {
                     oldKeys += 1;
+                    importedMasterKeyIds.add(key.getMasterKeyId());
                 } else {
                     newKeys += 1;
                     if (key.isSecret()) {
                         secret += 1;
                     }
+                    importedMasterKeyIds.add(key.getMasterKeyId());
                 }
 
             } catch (IOException e) {
@@ -210,8 +214,14 @@ public class PgpImportExport {
             resultType |= ImportKeyResult.RESULT_CANCELLED;
         }
 
-        return new ImportKeyResult(resultType, log, newKeys, oldKeys, badKeys, secret);
+        // convert to long array
+        long[] importedMasterKeyIdsArray = new long[importedMasterKeyIds.size()];
+        for (int i = 0; i < importedMasterKeyIds.size(); ++i) {
+            importedMasterKeyIdsArray[i] = importedMasterKeyIds.get(i);
+        }
 
+        return new ImportKeyResult(resultType, log, newKeys, oldKeys, badKeys, secret,
+                importedMasterKeyIdsArray);
     }
 
     public Bundle exportKeyRings(ArrayList<Long> publicKeyRingMasterIds,
-- 
cgit v1.2.3