diff options
Diffstat (limited to 'plugins/openpgp/src/file_transfer/file_decryptor.vala')
| -rw-r--r-- | plugins/openpgp/src/file_transfer/file_decryptor.vala | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/plugins/openpgp/src/file_transfer/file_decryptor.vala b/plugins/openpgp/src/file_transfer/file_decryptor.vala index 97eb9f43..455f853d 100644 --- a/plugins/openpgp/src/file_transfer/file_decryptor.vala +++ b/plugins/openpgp/src/file_transfer/file_decryptor.vala @@ -19,18 +19,20 @@ public class PgpFileDecryptor : FileDecryptor, Object { public async InputStream decrypt_file(InputStream encrypted_stream, Conversation conversation, FileTransfer file_transfer, FileReceiveData receive_data) throws FileReceiveError { try { uint8[] buf = new uint8[256]; - Array<uint8> data = new Array<uint8>(false, true, 0); + ByteArray data = new ByteArray(); size_t len = -1; do { - len = encrypted_stream.read(buf); - data.append_vals(buf, (uint) len); + len = yield encrypted_stream.read_async(buf); + data.append(buf[0:len]); } while(len > 0); GPGHelper.DecryptedData clear_data = GPGHelper.decrypt_data(data.data); file_transfer.encryption = Encryption.PGP; if (clear_data.filename != null && clear_data.filename != "") { + debug("Decrypting file %s from %s", clear_data.filename, file_transfer.file_name); file_transfer.file_name = clear_data.filename; } else if (file_transfer.file_name.has_suffix(".pgp")) { + debug("Decrypting file %s from %s", file_transfer.file_name.substring(0, file_transfer.file_name.length - 4), file_transfer.file_name); file_transfer.file_name = file_transfer.file_name.substring(0, file_transfer.file_name.length - 4); } return new MemoryInputStream.from_data(clear_data.data, GLib.free); |