Add file upload preview

fixes #756

1 files changed, 7 insertions, 8 deletions

diff --git a/main/src/ui/chat_input/chat_input_controller.vala b/main/src/ui/chat_input/chat_input_controller.vala
index 4844ff6c..fb7f88b1 100644
--- a/main/src/ui/chat_input/chat_input_controller.vala
+++ b/main/src/ui/chat_input/chat_input_controller.vala
@@ -9,6 +9,7 @@ namespace Dino.Ui {
 public class ChatInputController : Object {
 
     public signal void activate_last_message_correction();
+    public signal void file_picker_selected();
 
     public new string? conversation_display_name { get; set; }
     public string? conversation_topic { get; set; }
@@ -33,11 +34,12 @@ public class ChatInputController : Object {
 
         chat_input.chat_text_view.text_view.buffer.changed.connect(on_text_input_changed);
         chat_input.chat_text_view.text_view.key_press_event.connect(on_text_input_key_press);
+
         chat_text_view_controller.send_text.connect(send_text);
 
         chat_input.encryption_widget.encryption_changed.connect(on_encryption_changed);
 
-        stream_interactor.get_module(FileManager.IDENTITY).upload_available.connect(on_upload_available);
+        chat_input.file_button.clicked.connect(() => file_picker_selected());
     }
 
     public void set_conversation(Conversation conversation) {
@@ -51,6 +53,10 @@ public class ChatInputController : Object {
         chat_text_view_controller.initialize_for_conversation(conversation);
     }
 
+    public void set_file_upload_active(bool active) {
+        chat_input.set_file_upload_active(active);
+    }
+
     private void on_encryption_changed(Plugins.EncryptionListEntry? encryption_entry) {
         reset_input_field_status();
 
@@ -72,13 +78,6 @@ public class ChatInputController : Object {
         set_input_field_status(new Plugins.InputFieldStatus("", Plugins.InputFieldStatus.MessageType.NONE, Plugins.InputFieldStatus.InputState.NORMAL));
     }
 
-    private void on_upload_available(Account account) {
-        if (conversation != null && conversation.account.equals(account)) {
-            chat_input.file_button.visible = true;
-            chat_input.file_separator.visible = true;
-        }
-    }
-
     private void send_text() {
         // Don't do anything if we're in a NO_SEND state. Don't clear the chat input, don't send.
         if (input_field_status.input_state == Plugins.InputFieldStatus.InputState.NO_SEND) {