Merge branch 'development' of github.com:open-keychain/open-keychain into development

1 files changed, 39 insertions, 18 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java
index 9db9e700f..da532d2dc 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java
@@ -456,32 +456,53 @@ public class ImportExportOperation extends BaseOperation {
             // For each public masterKey id
             while (!cursor.isAfterLast()) {
 
-                // Create an output stream
-                ArmoredOutputStream arOutStream = new ArmoredOutputStream(outStream);
-                String version = PgpHelper.getVersionForHeader(mContext);
-                if (version != null) {
-                    arOutStream.setHeader("Version", version);
-                }
-
                 long keyId = cursor.getLong(0);
+                ArmoredOutputStream arOutStream = null;
+
+                // Create an output stream
+                try {
+                    arOutStream = new ArmoredOutputStream(outStream);
+                    String version = PgpHelper.getVersionForHeader(mContext);
+                    if (version != null) {
+                        arOutStream.setHeader("Version", version);
+                    }
 
-                log.add(LogType.MSG_EXPORT_PUBLIC, 1, KeyFormattingUtils.beautifyKeyId(keyId));
+                    log.add(LogType.MSG_EXPORT_PUBLIC, 1, KeyFormattingUtils.beautifyKeyId(keyId));
 
-                { // export public key part
-                    byte[] data = cursor.getBlob(1);
-                    arOutStream.write(data);
-                    arOutStream.close();
+                    { // export public key part
+                        byte[] data = cursor.getBlob(1);
+                        arOutStream.write(data);
 
-                    okPublic += 1;
+                        okPublic += 1;
+                    }
+                } finally {
+                    // make sure this is closed
+                    if (arOutStream != null) {
+                        arOutStream.close();
+                    }
+                    arOutStream = null;
                 }
 
-                // export secret key part
                 if (exportSecret && cursor.getInt(3) > 0) {
-                    log.add(LogType.MSG_EXPORT_SECRET, 2, KeyFormattingUtils.beautifyKeyId(keyId));
-                    byte[] data = cursor.getBlob(2);
-                    arOutStream.write(data);
+                    try {
+                        arOutStream = new ArmoredOutputStream(outStream);
+                        String version = PgpHelper.getVersionForHeader(mContext);
+                        if (version != null) {
+                            arOutStream.setHeader("Version", version);
+                        }
 
-                    okSecret += 1;
+                    // export secret key part
+                        log.add(LogType.MSG_EXPORT_SECRET, 2, KeyFormattingUtils.beautifyKeyId(keyId));
+                        byte[] data = cursor.getBlob(2);
+                        arOutStream.write(data);
+
+                        okSecret += 1;
+                    } finally {
+                        // make sure this is closed
+                        if (arOutStream != null) {
+                            arOutStream.close();
+                        }
+                    }
                 }
 
                 updateProgress(progress++, numKeys);