cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

forgot a thing for secret key export

Browse Source
This commit is contained in:
Vincent Breitmoser
2014-10-30 15:10:20 +01:00
parent a221464f38
commit 7017527999
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java
View File

@@ -458,6 +458,7 @@ public class ImportExportOperation extends BaseOperation {
// Create an output stream // Create an output stream
ArmoredOutputStream arOutStream = new ArmoredOutputStream(outStream); ArmoredOutputStream arOutStream = new ArmoredOutputStream(outStream);
try {
String version = PgpHelper.getVersionForHeader(mContext); String version = PgpHelper.getVersionForHeader(mContext);
if (version != null) { if (version != null) {
arOutStream.setHeader("Version", version); arOutStream.setHeader("Version", version);
@@ -470,7 +471,6 @@ public class ImportExportOperation extends BaseOperation {
{ // export public key part { // export public key part
byte[] data = cursor.getBlob(1); byte[] data = cursor.getBlob(1);
arOutStream.write(data); arOutStream.write(data);
arOutStream.close();
okPublic += 1; okPublic += 1;
} }
@@ -483,6 +483,12 @@ public class ImportExportOperation extends BaseOperation {
okSecret += 1; okSecret += 1;
} }
} finally {
// make sure this is closed
if (arOutStream != null) {
arOutStream.close();
}
}
updateProgress(progress++, numKeys); updateProgress(progress++, numKeys);