Handle xmpp ?join and ?message uris

4 files changed, 12 insertions, 12 deletions

diff --git a/plugins/http-files/src/plugin.vala b/plugins/http-files/src/plugin.vala
index 572efd93..ac6ca87a 100644
--- a/plugins/http-files/src/plugin.vala
+++ b/plugins/http-files/src/plugin.vala
@@ -11,13 +11,13 @@ public class Plugin : RootInterface, Object {
     public void registered(Dino.Application app) {
         try {
             this.app = app;
-            this.conversations_titlebar_entry = new ConversationsTitlebarEntry(app.stream_interaction);
+            this.conversations_titlebar_entry = new ConversationsTitlebarEntry(app.stream_interactor);
 
             this.app.plugin_registry.register_contact_titlebar_entry(conversations_titlebar_entry);
-            this.app.stream_interaction.module_manager.initialize_account_modules.connect((account, list) => {
+            this.app.stream_interactor.module_manager.initialize_account_modules.connect((account, list) => {
                 list.add(new UploadStreamModule());
             });
-            Manager.start(this.app.stream_interaction);
+            Manager.start(this.app.stream_interactor);
         } catch (Error e) {
             print(@"Error initializing http-files: $(e.message)\n");
         }
diff --git a/plugins/omemo/src/encryption_list_entry.vala b/plugins/omemo/src/encryption_list_entry.vala
index 7b769e85..2e8905e2 100644
--- a/plugins/omemo/src/encryption_list_entry.vala
+++ b/plugins/omemo/src/encryption_list_entry.vala
@@ -16,8 +16,8 @@ public class EncryptionListEntry : Plugins.EncryptionListEntry, Object {
     }}
 
     public bool can_encrypt(Entities.Conversation conversation) {
-        return plugin.app.stream_interaction.get_module(Manager.IDENTITY).can_encrypt(conversation);
+        return plugin.app.stream_interactor.get_module(Manager.IDENTITY).can_encrypt(conversation);
     }
 }
 
-}
\ No newline at end of file
+}
diff --git a/plugins/omemo/src/plugin.vala b/plugins/omemo/src/plugin.vala
index 6851aa5e..e783b7be 100644
--- a/plugins/omemo/src/plugin.vala
+++ b/plugins/omemo/src/plugin.vala
@@ -37,10 +37,10 @@ public class Plugin : RootInterface, Object {
             this.settings_entry = new AccountSettingsEntry(this);
             this.app.plugin_registry.register_encryption_list_entry(list_entry);
             this.app.plugin_registry.register_account_settings_entry(settings_entry);
-            this.app.stream_interaction.module_manager.initialize_account_modules.connect((account, list) => {
+            this.app.stream_interactor.module_manager.initialize_account_modules.connect((account, list) => {
                 list.add(new StreamModule());
             });
-            Manager.start(this.app.stream_interaction, db);
+            Manager.start(this.app.stream_interactor, db);
 
             string locales_dir;
             if (app.search_path_generator != null) {
@@ -59,4 +59,4 @@ public class Plugin : RootInterface, Object {
     }
 }
 
-}
\ No newline at end of file
+}
diff --git a/plugins/openpgp/src/plugin.vala b/plugins/openpgp/src/plugin.vala
index edf19c96..2f664656 100644
--- a/plugins/openpgp/src/plugin.vala
+++ b/plugins/openpgp/src/plugin.vala
@@ -19,16 +19,16 @@ public class Plugin : Plugins.RootInterface, Object {
     public void registered(Dino.Application app) {
         this.app = app;
         this.db = new Database(Path.build_filename(Application.get_storage_dir(), "pgp.db"));
-        this.list_entry = new EncryptionListEntry(app.stream_interaction);
+        this.list_entry = new EncryptionListEntry(app.stream_interactor);
         this.settings_entry = new AccountSettingsEntry(this);
-        this.contact_details_provider = new ContactDetailsProvider(app.stream_interaction);
+        this.contact_details_provider = new ContactDetailsProvider(app.stream_interactor);
 
         app.plugin_registry.register_encryption_list_entry(list_entry);
         app.plugin_registry.register_account_settings_entry(settings_entry);
         app.plugin_registry.register_contact_details_entry(contact_details_provider);
-        app.stream_interaction.module_manager.initialize_account_modules.connect(on_initialize_account_modules);
+        app.stream_interactor.module_manager.initialize_account_modules.connect(on_initialize_account_modules);
 
-        Manager.start(app.stream_interaction, db);
+        Manager.start(app.stream_interactor, db);
 
         internationalize(GETTEXT_PACKAGE, app.search_path_generator.get_locale_path(GETTEXT_PACKAGE, LOCALE_INSTALL_DIR));
     }