moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-14 21:05:09 -05:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dominik Schürmann 2014-11-02 17:50:38 +01:00
commit 602930d929
1 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -456,32 +456,53 @@ public class ImportExportOperation extends BaseOperation {
// For each public masterKey id // For each public masterKey id
while (!cursor.isAfterLast()) { while (!cursor.isAfterLast()) {
long keyId = cursor.getLong(0);
ArmoredOutputStream arOutStream = null;
// Create an output stream // Create an output stream
ArmoredOutputStream arOutStream = new ArmoredOutputStream(outStream); try {
arOutStream = new ArmoredOutputStream(outStream);
String version = PgpHelper.getVersionForHeader(mContext); String version = PgpHelper.getVersionForHeader(mContext);
if (version != null) { if (version != null) {
arOutStream.setHeader("Version", version); arOutStream.setHeader("Version", version);
} }
long keyId = cursor.getLong(0);
log.add(LogType.MSG_EXPORT_PUBLIC, 1, KeyFormattingUtils.beautifyKeyId(keyId)); log.add(LogType.MSG_EXPORT_PUBLIC, 1, KeyFormattingUtils.beautifyKeyId(keyId));
{ // 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;
} }
} finally {
// make sure this is closed
if (arOutStream != null) {
arOutStream.close();
}
arOutStream = null;
}
if (exportSecret && cursor.getInt(3) > 0) {
try {
arOutStream = new ArmoredOutputStream(outStream);
String version = PgpHelper.getVersionForHeader(mContext);
if (version != null) {
arOutStream.setHeader("Version", version);
}
// export secret key part // export secret key part
if (exportSecret && cursor.getInt(3) > 0) {
log.add(LogType.MSG_EXPORT_SECRET, 2, KeyFormattingUtils.beautifyKeyId(keyId)); log.add(LogType.MSG_EXPORT_SECRET, 2, KeyFormattingUtils.beautifyKeyId(keyId));
byte[] data = cursor.getBlob(2); byte[] data = cursor.getBlob(2);
arOutStream.write(data); arOutStream.write(data);
okSecret += 1; okSecret += 1;
} finally {
// make sure this is closed
if (arOutStream != null) {
arOutStream.close();
}
}
} }
updateProgress(progress++, numKeys); updateProgress(progress++, numKeys);