Code cleanup - move long database queries to their own functions and improve variable names

1 files changed, 5 insertions, 2 deletions

diff --git a/plugins/omemo/src/plugin.vala b/plugins/omemo/src/plugin.vala
index b63ed3f2..81cf5c7f 100644
--- a/plugins/omemo/src/plugin.vala
+++ b/plugins/omemo/src/plugin.vala
@@ -29,6 +29,8 @@ public class Plugin : RootInterface, Object {
     public AccountSettingsEntry settings_entry;
     public ContactDetailsProvider contact_details_provider;
     public DeviceNotificationPopulator device_notification_populator;
+    public OwnNotifications own_notifications;
+    public TrustManager trust_manager;
 
     public void registered(Dino.Application app) {
         ensure_context();
@@ -38,15 +40,16 @@ public class Plugin : RootInterface, Object {
         this.settings_entry = new AccountSettingsEntry(this);
         this.contact_details_provider = new ContactDetailsProvider(this);
         this.device_notification_populator = new DeviceNotificationPopulator(this, this.app.stream_interactor);
+        this.trust_manager = new TrustManager(this.app.stream_interactor, this.db);
         this.app.plugin_registry.register_encryption_list_entry(list_entry);
         this.app.plugin_registry.register_account_settings_entry(settings_entry);
         this.app.plugin_registry.register_contact_details_entry(contact_details_provider);
         this.app.plugin_registry.register_notification_populator(device_notification_populator);
         this.app.stream_interactor.module_manager.initialize_account_modules.connect((account, list) => {
             list.add(new StreamModule());
-            new OwnNotifications(this, this.app.stream_interactor, account);
+            this.own_notifications = new OwnNotifications(this, this.app.stream_interactor, account);
         });
-        Manager.start(this.app.stream_interactor, db);
+        Manager.start(this.app.stream_interactor, db, trust_manager);
 
         string locales_dir;
         if (app.search_path_generator != null) {