Merge 'upstream/master'

2 files changed, 0 insertions, 95 deletions

diff --git a/plugins/openpgp/src/file_transfer/file_decryptor.vala b/plugins/openpgp/src/file_transfer/file_decryptor.vala
deleted file mode 100644
index 2deb5823..00000000
--- a/plugins/openpgp/src/file_transfer/file_decryptor.vala
+++ /dev/null
@@ -1,50 +0,0 @@
-using Dino.Entities;
-
-namespace Dino.Plugins.OpenPgp {
-
-public class PgpFileDecryptor : FileDecryptor, Object {
-
-    public Encryption get_encryption() {
-        return Encryption.PGP;
-    }
-
-    public FileReceiveData prepare_get_meta_info(Conversation conversation, FileTransfer file_transfer, FileReceiveData receive_data) {
-        return receive_data;
-    }
-
-    public FileMeta prepare_download_file(Conversation conversation, FileTransfer file_transfer, FileReceiveData receive_data, FileMeta file_meta) {
-        return file_meta;
-    }
-
-    public bool can_decrypt_file(Conversation conversation, FileTransfer file_transfer, FileReceiveData receive_data) {
-        return file_transfer.file_name.has_suffix("pgp") ||
-                (file_transfer.content_type != null && file_transfer.content_type.get_mime_type() == "application/pgp-encrypted");
-    }
-
-    public async InputStream decrypt_file(InputStream encrypted_stream, Conversation conversation, FileTransfer file_transfer, FileReceiveData receive_data) throws FileReceiveError {
-        try {
-            uint8[] buf = new uint8[256];
-            ByteArray data = new ByteArray();
-            size_t len = -1;
-            do {
-                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);
-        } catch (Error e) {
-            throw new FileReceiveError.DECRYPTION_FAILED("PGP file decryption error: %s".printf(e.message));
-        }
-    }
-}
-
-}
diff --git a/plugins/openpgp/src/file_transfer/file_encryptor.vala b/plugins/openpgp/src/file_transfer/file_encryptor.vala
deleted file mode 100644
index 66e93bd9..00000000
--- a/plugins/openpgp/src/file_transfer/file_encryptor.vala
+++ /dev/null
@@ -1,45 +0,0 @@
-using Dino.Entities;
-
-namespace Dino.Plugins.OpenPgp {
-
-public class PgpFileEncryptor : Dino.FileEncryptor, Object {
-
-    StreamInteractor stream_interactor;
-
-    public PgpFileEncryptor(StreamInteractor stream_interactor) {
-        this.stream_interactor = stream_interactor;
-    }
-
-    public bool can_encrypt_file(Conversation conversation, FileTransfer file_transfer) {
-        return conversation.encryption == Encryption.PGP;
-    }
-
-    public FileMeta encrypt_file(Conversation conversation, FileTransfer file_transfer) throws FileSendError {
-        FileMeta file_meta = new FileMeta();
-
-        try {
-            GPG.Key[] keys = stream_interactor.get_module(Manager.IDENTITY).get_key_fprs(conversation);
-            uint8[] enc_content = GPGHelper.encrypt_file(file_transfer.get_file().get_path(), keys, GPG.EncryptFlags.ALWAYS_TRUST, file_transfer.file_name);
-            file_transfer.input_stream = new MemoryInputStream.from_data(enc_content, GLib.free);
-            file_transfer.encryption = Encryption.PGP;
-            file_transfer.server_file_name = Xmpp.random_uuid() + ".pgp";
-            file_meta.size = enc_content.length;
-        } catch (Error e) {
-            throw new FileSendError.ENCRYPTION_FAILED("PGP file encryption error: %s".printf(e.message));
-        }
-        debug("Encrypting file %s as %s", file_transfer.file_name, file_transfer.server_file_name);
-
-        return file_meta;
-    }
-
-    public FileSendData? preprocess_send_file(Conversation conversation, FileTransfer file_transfer, FileSendData file_send_data, FileMeta file_meta) {
-        HttpFileSendData? send_data = file_send_data as HttpFileSendData;
-        if (send_data == null) return null;
-
-        send_data.encrypt_message = false;
-
-        return file_send_data;
-    }
-}
-
-}