From 49bcbdaa517e5d6f8d4860db70ae0a9960e2c519 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Wed, 2 Sep 2020 16:47:41 +0200 Subject: Fix initial file encryption displaying fixes #831 --- plugins/omemo/src/file_transfer/file_decryptor.vala | 4 ++++ plugins/omemo/src/jingle/jingle_helper.vala | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'plugins/omemo/src') diff --git a/plugins/omemo/src/file_transfer/file_decryptor.vala b/plugins/omemo/src/file_transfer/file_decryptor.vala index 3999d3b8..7aec41d5 100644 --- a/plugins/omemo/src/file_transfer/file_decryptor.vala +++ b/plugins/omemo/src/file_transfer/file_decryptor.vala @@ -13,6 +13,10 @@ public class OmemoFileDecryptor : FileDecryptor, Object { private Regex url_regex = /^aesgcm:\/\/(.*)#(([A-Fa-f0-9]{2}){48}|([A-Fa-f0-9]{2}){44})$/; + public Encryption get_encryption() { + return Encryption.OMEMO; + } + public FileReceiveData prepare_get_meta_info(Conversation conversation, FileTransfer file_transfer, FileReceiveData receive_data) { HttpFileReceiveData? http_receive_data = receive_data as HttpFileReceiveData; if (http_receive_data == null) assert(false); diff --git a/plugins/omemo/src/jingle/jingle_helper.vala b/plugins/omemo/src/jingle/jingle_helper.vala index 4b6ed646..ec6c0eca 100644 --- a/plugins/omemo/src/jingle/jingle_helper.vala +++ b/plugins/omemo/src/jingle/jingle_helper.vala @@ -42,12 +42,12 @@ public class EncryptionHelper : JingleFileEncryptionHelper, Object { return new Xep.Jet.Options(Omemo.NS_URI, AES_128_GCM_URI); } - public FileMeta complete_meta(FileTransfer file_transfer, FileReceiveData receive_data, FileMeta file_meta, Xmpp.Xep.JingleFileTransfer.FileTransfer jingle_transfer) { + public Encryption get_encryption(Xmpp.Xep.JingleFileTransfer.FileTransfer jingle_transfer) { Xep.Jet.SecurityParameters? security = jingle_transfer.security as Xep.Jet.SecurityParameters; if (security != null && security.encoding.get_type_uri() == Omemo.NS_URI) { - file_transfer.encryption = Encryption.OMEMO; + return Encryption.OMEMO; } - return file_meta; + return Encryption.NONE; } } -} \ No newline at end of file +} -- cgit v1.2.3-70-g09d2