From 6c428fa6b58fcaa8f681baa9ec5b98625c9cef91 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 20 Aug 2014 21:51:57 +0200
Subject: [PATCH] make number of secret keys imported part of ImportResult
 parcel

---
 .../sufficientlysecure/keychain/pgp/PgpImportExport.java | 9 ++++++---
 .../keychain/service/OperationResults.java               | 7 +++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

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 fd37112a5..94ff4a1ba 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
@@ -139,10 +139,10 @@ 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);
+                    ImportKeyResult.RESULT_FAIL_NOTHING, mProviderHelper.getLog(), 0, 0, 0, 0);
         }
 
-        int newKeys = 0, oldKeys = 0, badKeys = 0;
+        int newKeys = 0, oldKeys = 0, badKeys = 0, secret = 0;
 
         int position = 0;
         double progSteps = 100.0 / num;
@@ -177,6 +177,9 @@ public class PgpImportExport {
                     oldKeys += 1;
                 } else {
                     newKeys += 1;
+                    if (key.isSecret()) {
+                        secret += 1;
+                    }
                 }
 
             } catch (IOException e) {
@@ -213,7 +216,7 @@ public class PgpImportExport {
             }
         }
 
-        return new ImportKeyResult(resultType, log, newKeys, oldKeys, badKeys);
+        return new ImportKeyResult(resultType, log, newKeys, oldKeys, badKeys, secret);
 
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java
index 878f6ca47..c59a7d172 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java
@@ -40,7 +40,7 @@ public abstract class OperationResults {
 
     public static class ImportKeyResult extends OperationResultParcel {
 
-        public final int mNewKeys, mUpdatedKeys, mBadKeys;
+        public final int mNewKeys, mUpdatedKeys, mBadKeys, mSecret;
 
         // At least one new key
         public static final int RESULT_OK_NEWKEYS = 2;
@@ -76,14 +76,16 @@ public abstract class OperationResults {
             mNewKeys = source.readInt();
             mUpdatedKeys = source.readInt();
             mBadKeys = source.readInt();
+            mSecret = source.readInt();
         }
 
         public ImportKeyResult(int result, OperationLog log,
-                               int newKeys, int updatedKeys, int badKeys) {
+                               int newKeys, int updatedKeys, int badKeys, int secret) {
             super(result, log);
             mNewKeys = newKeys;
             mUpdatedKeys = updatedKeys;
             mBadKeys = badKeys;
+            mSecret = secret;
         }
 
         @Override
@@ -92,6 +94,7 @@ public abstract class OperationResults {
             dest.writeInt(mNewKeys);
             dest.writeInt(mUpdatedKeys);
             dest.writeInt(mBadKeys);
+            dest.writeInt(mSecret);
         }
 
         public static Creator<ImportKeyResult> CREATOR = new Creator<ImportKeyResult>() {