aboutsummaryrefslogtreecommitdiff
path: root/libdino/src
diff options
context:
space:
mode:
authorhrxi <hrrrxi@gmail.com>2019-06-23 14:53:18 +0200
committerhrxi <hrrrxi@gmail.com>2019-07-09 11:21:39 +0200
commit877c46628fa2836f9226e24a3d0a84b9a3f821e6 (patch)
tree08f319b9223ed8eac4c44e70dfc77ead881e722c /libdino/src
parent6c480b862eefc38b2d3ba8dc7e02ddbe8d13edee (diff)
downloaddino-877c46628fa2836f9226e24a3d0a84b9a3f821e6.tar.gz
dino-877c46628fa2836f9226e24a3d0a84b9a3f821e6.zip
Implement file sending via Jingle
This is still disabled by default until prioritization is implemented; otherwise this could be preferred to HTTP uploads. File sending only works via Jingle In-Band-Bytestreams right now, more transports are going to be implemented. To test this, uncomment the line with `JingleFileTransfer` in libdino/src/application.vala.
Diffstat (limited to 'libdino/src')
-rw-r--r--libdino/src/application.vala1
-rw-r--r--libdino/src/entity/file_transfer.vala1
-rw-r--r--libdino/src/service/file_manager.vala1
-rw-r--r--libdino/src/service/jingle_file_manager.vala52
-rw-r--r--libdino/src/service/module_manager.vala4
5 files changed, 59 insertions, 0 deletions
diff --git a/libdino/src/application.vala b/libdino/src/application.vala
index da098fb4..b1838607 100644
--- a/libdino/src/application.vala
+++ b/libdino/src/application.vala
@@ -37,6 +37,7 @@ public interface Dino.Application : GLib.Application {
RosterManager.start(stream_interactor, db);
ChatInteraction.start(stream_interactor);
FileManager.start(stream_interactor, db);
+ //JingleFileManager.start(stream_interactor); // TODO(hrxi): Activate
ContentItemStore.start(stream_interactor, db);
NotificationEvents.start(stream_interactor);
SearchProcessor.start(stream_interactor, db);
diff --git a/libdino/src/entity/file_transfer.vala b/libdino/src/entity/file_transfer.vala
index 6b1492d6..68234a48 100644
--- a/libdino/src/entity/file_transfer.vala
+++ b/libdino/src/entity/file_transfer.vala
@@ -53,6 +53,7 @@ public class FileTransfer : Object {
}
public string path { get; set; }
public string? mime_type { get; set; }
+ // TODO(hrxi): expand to 64 bit
public int size { get; set; }
public State state { get; set; }
diff --git a/libdino/src/service/file_manager.vala b/libdino/src/service/file_manager.vala
index 6f8ccee4..9873539a 100644
--- a/libdino/src/service/file_manager.vala
+++ b/libdino/src/service/file_manager.vala
@@ -65,6 +65,7 @@ public class FileManager : StreamInteractionModule, Object {
foreach (FileSender file_sender in file_senders) {
if (file_sender.can_send(conversation, file_transfer)) {
+ // TODO(hrxi): Currently, this tries to send the file with every transfer available, but it should probably only select one.
file_sender.send_file(conversation, file_transfer);
}
}
diff --git a/libdino/src/service/jingle_file_manager.vala b/libdino/src/service/jingle_file_manager.vala
new file mode 100644
index 00000000..055f0758
--- /dev/null
+++ b/libdino/src/service/jingle_file_manager.vala
@@ -0,0 +1,52 @@
+using Gdk;
+using Gee;
+
+using Xmpp;
+using Dino.Entities;
+
+namespace Dino {
+
+public class JingleFileManager : StreamInteractionModule, FileSender, Object {
+ public static ModuleIdentity<JingleFileManager> IDENTITY = new ModuleIdentity<JingleFileManager>("jingle_files");
+ public string id { get { return IDENTITY.id; } }
+
+ private StreamInteractor stream_interactor;
+
+ public static void start(StreamInteractor stream_interactor) {
+ JingleFileManager m = new JingleFileManager(stream_interactor);
+ stream_interactor.add_module(m);
+ }
+
+ private JingleFileManager(StreamInteractor stream_interactor) {
+ this.stream_interactor = stream_interactor;
+
+ stream_interactor.get_module(FileManager.IDENTITY).add_sender(this);
+ }
+
+ public bool is_upload_available(Conversation conversation) {
+ // TODO(hrxi) Here and in `send_file`: What should happen if `stream == null`?
+ XmppStream? stream = stream_interactor.get_stream(conversation.account);
+ foreach (Jid full_jid in stream.get_flag(Presence.Flag.IDENTITY).get_resources(conversation.counterpart)) {
+ if (stream.get_module(Xep.JingleFileTransfer.Module.IDENTITY).is_available(stream, full_jid)) {
+ return true;
+ }
+ }
+ return false;
+ }
+ public bool can_send(Conversation conversation, FileTransfer file_transfer) {
+ return file_transfer.encryption != Encryption.OMEMO;
+ }
+ public void send_file(Conversation conversation, FileTransfer file_transfer) {
+ XmppStream? stream = stream_interactor.get_stream(file_transfer.account);
+ foreach (Jid full_jid in stream.get_flag(Presence.Flag.IDENTITY).get_resources(conversation.counterpart)) {
+ // TODO(hrxi): Prioritization of transports (and resources?).
+ if (!stream.get_module(Xep.JingleFileTransfer.Module.IDENTITY).is_available(stream, full_jid)) {
+ continue;
+ }
+ stream.get_module(Xep.JingleFileTransfer.Module.IDENTITY).offer_file_stream(stream, full_jid, file_transfer.input_stream, file_transfer.file_name, file_transfer.size);
+ return;
+ }
+ }
+}
+
+}
diff --git a/libdino/src/service/module_manager.vala b/libdino/src/service/module_manager.vala
index 41a2c6a0..16bf5a60 100644
--- a/libdino/src/service/module_manager.vala
+++ b/libdino/src/service/module_manager.vala
@@ -78,6 +78,10 @@ public class ModuleManager {
module_map[account].add(new StreamError.Module());
module_map[account].add(new Xep.InBandRegistration.Module());
module_map[account].add(new Xep.HttpFileUpload.Module());
+ module_map[account].add(new Xep.InBandBytestreams.Module());
+ module_map[account].add(new Xep.Jingle.Module());
+ module_map[account].add(new Xep.JingleInBandBytestreams.Module());
+ module_map[account].add(new Xep.JingleFileTransfer.Module());
initialize_account_modules(account, module_map[account]);
}
}