Only display transferred images, display file names, open in system viewer, include and use pgp embedded file names

2 files changed, 9 insertions, 17 deletions

diff --git a/plugins/http-files/src/file_provider.vala b/plugins/http-files/src/file_provider.vala
index bfeca922..5737ebf8 100644
--- a/plugins/http-files/src/file_provider.vala
+++ b/plugins/http-files/src/file_provider.vala
@@ -20,10 +20,8 @@ public class FileProvider : Dino.FileProvider, Object {
         this.url_regex = new Regex("""^(?i)\b((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))$""");
         this.file_ext_regex = new Regex("""\.(png|jpg|jpeg|svg|gif|pgp)$""");
 
-        stream_interactor.get_module(MessageProcessor.IDENTITY).message_sent.connect(check_out_message);
         stream_interactor.get_module(MessageProcessor.IDENTITY).received_pipeline.connect(new ReceivedMessageListener(this));
         stream_interactor.get_module(Manager.IDENTITY).uploaded.connect((file_transfer, url) => {
-            file_transfer.info = url;
             ignore_once.add(url);
         });
     }
@@ -56,14 +54,6 @@ public class FileProvider : Dino.FileProvider, Object {
         }
     }
 
-    public void check_out_message(Message message, Conversation conversation) {
-        if (ignore_once.remove(message.body)) return;
-        if (message.body.length < 5) return;
-        if (!url_regex.match(message.body)) return;
-        if (!file_ext_regex.match(message.body)) return;
-        download_url(message, conversation);
-    }
-
     private async bool download_url(Message message, Conversation conversation) {
         bool success = false;
         var session = new Soup.Session();
@@ -101,7 +91,7 @@ public class FileProvider : Dino.FileProvider, Object {
                             file_transfer.size = int.parse(content_length);
                             file_transfer.state = FileTransfer.State.NOT_STARTED;
                             file_transfer.provider = 0;
-                            file_transfer.info = message.body;
+                            file_transfer.info = message.id.to_string();
                             file_incoming(file_transfer);
                             success = true;
                             Idle.add((owned)callback);
diff --git a/plugins/http-files/src/manager.vala b/plugins/http-files/src/manager.vala
index 3be3c6a7..c27babe2 100644
--- a/plugins/http-files/src/manager.vala
+++ b/plugins/http-files/src/manager.vala
@@ -35,7 +35,11 @@ public class Manager : StreamInteractionModule, FileSender, Object {
             stream_interactor.module_manager.get_module(file_transfer.account, UploadStreamModule.IDENTITY).upload(stream, file_transfer.input_stream, file_transfer.server_file_name, file_transfer.size, file_transfer.mime_type,
                 (stream, url_down) => {
                     uploaded(file_transfer, url_down);
-                    stream_interactor.get_module(MessageProcessor.IDENTITY).send_message(url_down, conversation);
+                    file_transfer.info = url_down;
+                    Entities.Message message = stream_interactor.get_module(MessageProcessor.IDENTITY).create_out_message(url_down, conversation);
+                    message.encryption = Encryption.NONE;
+                    stream_interactor.get_module(MessageProcessor.IDENTITY).send_message(message, conversation);
+                    file_transfer.info = message.id.to_string();
                 },
                 (stream, error_str) => {
                     print(@"Failed getting upload url + $error_str\n");
@@ -97,11 +101,9 @@ public class FileMessageFilterDisplay : Plugins.MessageDisplayProvider, Object {
 }
 
 private bool message_is_file(Database db, Entities.Message message) {
-    Qlite.QueryBuilder builder = db.file_transfer.select()
-                .with(db.file_transfer.info, "=", message.body)
-                .with(db.file_transfer.account_id, "=", message.account.id)
-                .with(db.file_transfer.counterpart_id, "=", db.get_jid_id(message.counterpart));
-    return builder.count() > 0;
+    Qlite.QueryBuilder builder = db.file_transfer.select().with(db.file_transfer.info, "=", message.id.to_string());
+    Qlite.QueryBuilder builder2 = db.file_transfer.select().with(db.file_transfer.info, "=", message.body);
+    return builder.count() > 0 || builder2.count() > 0;
 }
 
 }