From 15cee8e7e995afe1c435004c3abba521439e4e0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 8 Jul 2015 03:12:20 +0200
Subject: Temporary fix for multi export

---
 .../keychain/ui/KeyListFragment.java               | 33 +++++++++++++---------
 1 file changed, 19 insertions(+), 14 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
index c5bfdbedf..bb19fe2b1 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
@@ -118,6 +118,7 @@ public class KeyListFragment extends LoaderFragment
 
     // This ids for multiple key export.
     private ArrayList<Long> mIdsForRepeatAskPassphrase;
+    private ArrayList<Long> mIdsForExport;
     // This index for remembering the number of master key.
     private int mIndex;
 
@@ -642,6 +643,7 @@ public class KeyListFragment extends LoaderFragment
 
     private void showMultiExportDialog(long[] masterKeyIds) {
         mIdsForRepeatAskPassphrase = new ArrayList<>();
+        mIdsForExport = new ArrayList<>();
         for (long id : masterKeyIds) {
             try {
                 if (PassphraseCacheService.getCachedPassphrase(
@@ -651,6 +653,7 @@ public class KeyListFragment extends LoaderFragment
             } catch (PassphraseCacheService.KeyNotFoundException e) {
                 // This happens when the master key is stripped
                 // and ignore this key.
+                mIdsForExport.add(id);
             }
         }
         mIndex = 0;
@@ -658,13 +661,9 @@ public class KeyListFragment extends LoaderFragment
             startPassphraseActivity();
             return;
         }
-        long[] idsForMultiExport = new long[mIdsForRepeatAskPassphrase.size()];
-        for (int i = 0; i < mIdsForRepeatAskPassphrase.size(); ++i) {
-            idsForMultiExport[i] = mIdsForRepeatAskPassphrase.get(i);
-        }
-        mExportHelper.showExportKeysDialog(idsForMultiExport,
-                Constants.Path.APP_DIR_FILE,
-                mAdapter.isAnySecretSelected());
+
+        mIdsForExport.addAll(mIdsForRepeatAskPassphrase);
+        finishExport();
     }
 
     private void startPassphraseActivity() {
@@ -674,6 +673,16 @@ public class KeyListFragment extends LoaderFragment
         startActivityForResult(intent, REQUEST_REPEAT_PASSPHRASE);
     }
 
+    private void finishExport() {
+        long[] idsForMultiExport = new long[mIdsForExport.size()];
+        for (int i = 0; i < mIdsForExport.size(); i++) {
+            idsForMultiExport[i] = mIdsForExport.get(i);
+        }
+        mExportHelper.showExportKeysDialog(idsForMultiExport,
+                Constants.Path.APP_DIR_FILE,
+                mAdapter.isAnySecretSelected());
+    }
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (mImportOpHelper != null) {
@@ -692,13 +701,9 @@ public class KeyListFragment extends LoaderFragment
                 startPassphraseActivity();
                 return;
             }
-            long[] idsForMultiExport = new long[mIdsForRepeatAskPassphrase.size()];
-            for (int i = 0; i < mIdsForRepeatAskPassphrase.size(); ++i) {
-                idsForMultiExport[i] = mIdsForRepeatAskPassphrase.get(i);
-            }
-            mExportHelper.showExportKeysDialog(idsForMultiExport,
-                    Constants.Path.APP_DIR_FILE,
-                    mAdapter.isAnySecretSelected());
+
+            mIdsForExport.addAll(mIdsForRepeatAskPassphrase);
+            finishExport();
         }
 
         if (requestCode == REQUEST_ACTION) {
-- 
cgit v1.2.3