From e1285eec7b3fea5ea86bb8cac598e98d6d9f7f14 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 29 Oct 2014 22:39:38 +0100
Subject: Close stream on key export to avoid partial write (see #986)

---
 .../keychain/operations/ImportExportOperation.java                 | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'OpenKeychain')

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 6dfac8429..9db9e700f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java
@@ -494,6 +494,13 @@ public class ImportExportOperation extends BaseOperation {
         } catch (IOException e) {
             log.add(LogType.MSG_EXPORT_ERROR_IO, 1);
             return new ExportResult(ExportResult.RESULT_ERROR, log, okPublic, okSecret);
+        } finally {
+            // Make sure the stream is closed
+            if (outStream != null) try {
+                outStream.close();
+            } catch (Exception e) {
+                Log.e(Constants.TAG, "error closing stream", e);
+            }
         }
 
 
-- 
cgit v1.2.3