Add typed identity to manager modules and stream flags

1 files changed, 54 insertions, 59 deletions

diff --git a/libdino/src/service/roster_manager.vala b/libdino/src/service/roster_manager.vala
index 720a746a..86bd7a21 100644
--- a/libdino/src/service/roster_manager.vala
+++ b/libdino/src/service/roster_manager.vala
@@ -4,79 +4,74 @@ using Xmpp;
 using Dino.Entities;
 
 namespace Dino {
-    public class RosterManager : StreamInteractionModule, Object {
-        public const string id = "roster_manager";
 
-        public signal void removed_roster_item(Account account, Jid jid, Roster.Item roster_item);
-        public signal void updated_roster_item(Account account, Jid jid, Roster.Item roster_item);
+public class RosterManager : StreamInteractionModule, Object {
+    public static ModuleIdentity<RosterManager> IDENTITY = new ModuleIdentity<RosterManager>("roster_manager");
+    public string id { get { return IDENTITY.id; } }
 
-        private StreamInteractor stream_interactor;
+    public signal void removed_roster_item(Account account, Jid jid, Roster.Item roster_item);
+    public signal void updated_roster_item(Account account, Jid jid, Roster.Item roster_item);
 
-        public static void start(StreamInteractor stream_interactor) {
-            RosterManager m = new RosterManager(stream_interactor);
-            stream_interactor.add_module(m);
-        }
-
-        public RosterManager(StreamInteractor stream_interactor) {
-            this.stream_interactor = stream_interactor;
-            stream_interactor.account_added.connect(on_account_added);
-        }
+    private StreamInteractor stream_interactor;
 
-        public ArrayList<Roster.Item> get_roster(Account account) {
-            Core.XmppStream? stream = stream_interactor.get_stream(account);
-            ArrayList<Roster.Item> ret = new ArrayList<Roster.Item>();
-            if (stream != null) {
-                ret.add_all(Xmpp.Roster.Flag.get_flag(stream).get_roster());
-            }
-            return ret;
-        }
+    public static void start(StreamInteractor stream_interactor) {
+        RosterManager m = new RosterManager(stream_interactor);
+        stream_interactor.add_module(m);
+    }
 
-        public Roster.Item? get_roster_item(Account account, Jid jid) {
-            Core.XmppStream? stream = stream_interactor.get_stream(account);
-            if (stream != null) {
-                return Xmpp.Roster.Flag.get_flag(stream).get_item(jid.bare_jid.to_string());
-            }
-            return null;
-        }
+    public RosterManager(StreamInteractor stream_interactor) {
+        this.stream_interactor = stream_interactor;
+        stream_interactor.account_added.connect(on_account_added);
+    }
 
-        public void remove_jid(Account account, Jid jid) {
-            Core.XmppStream? stream = stream_interactor.get_stream(account);
-            if (stream != null) stream.get_module(Xmpp.Roster.Module.IDENTITY).remove_jid(stream, jid.bare_jid.to_string());
+    public ArrayList<Roster.Item> get_roster(Account account) {
+        Core.XmppStream? stream = stream_interactor.get_stream(account);
+        ArrayList<Roster.Item> ret = new ArrayList<Roster.Item>();
+        if (stream != null) {
+            ret.add_all(stream.get_flag(Roster.Flag.IDENTITY).get_roster());
         }
+        return ret;
+    }
 
-        public void add_jid(Account account, Jid jid, string? handle) {
-            Core.XmppStream? stream = stream_interactor.get_stream(account);
-            if (stream != null) stream.get_module(Xmpp.Roster.Module.IDENTITY).add_jid(stream, jid.bare_jid.to_string(), handle);
+    public Roster.Item? get_roster_item(Account account, Jid jid) {
+        Core.XmppStream? stream = stream_interactor.get_stream(account);
+        if (stream != null) {
+            return stream.get_flag(Roster.Flag.IDENTITY).get_item(jid.bare_jid.to_string());
         }
+        return null;
+    }
 
-        public static RosterManager? get_instance(StreamInteractor stream_interactor) {
-            return (RosterManager) stream_interactor.get_module(id);
-        }
+    public void remove_jid(Account account, Jid jid) {
+        Core.XmppStream? stream = stream_interactor.get_stream(account);
+        if (stream != null) stream.get_module(Xmpp.Roster.Module.IDENTITY).remove_jid(stream, jid.bare_jid.to_string());
+    }
 
-        internal string get_id() {
-            return id;
-        }
+    public void add_jid(Account account, Jid jid, string? handle) {
+        Core.XmppStream? stream = stream_interactor.get_stream(account);
+        if (stream != null) stream.get_module(Xmpp.Roster.Module.IDENTITY).add_jid(stream, jid.bare_jid.to_string(), handle);
+    }
 
-        private void on_account_added(Account account) {
-            stream_interactor.module_manager.get_module(account, Roster.Module.IDENTITY).received_roster.connect( (stream, roster) => {
-                on_roster_received(account, roster);
-            });
-            stream_interactor.module_manager.get_module(account, Roster.Module.IDENTITY).item_removed.connect( (stream, roster_item) => {
-                removed_roster_item(account, new Jid(roster_item.jid), roster_item);
-            });
-            stream_interactor.module_manager.get_module(account, Roster.Module.IDENTITY).item_updated.connect( (stream, roster_item) => {
-                on_roster_item_updated(account, roster_item);
-            });
-        }
+    private void on_account_added(Account account) {
+        stream_interactor.module_manager.get_module(account, Roster.Module.IDENTITY).received_roster.connect( (stream, roster) => {
+            on_roster_received(account, roster);
+        });
+        stream_interactor.module_manager.get_module(account, Roster.Module.IDENTITY).item_removed.connect( (stream, roster_item) => {
+            removed_roster_item(account, new Jid(roster_item.jid), roster_item);
+        });
+        stream_interactor.module_manager.get_module(account, Roster.Module.IDENTITY).item_updated.connect( (stream, roster_item) => {
+            on_roster_item_updated(account, roster_item);
+        });
+    }
 
-        private void on_roster_received(Account account, Collection<Roster.Item> roster_items) {
-            foreach (Roster.Item roster_item in roster_items) {
-                on_roster_item_updated(account, roster_item);
-            }
+    private void on_roster_received(Account account, Collection<Roster.Item> roster_items) {
+        foreach (Roster.Item roster_item in roster_items) {
+            on_roster_item_updated(account, roster_item);
         }
+    }
 
-        private void on_roster_item_updated(Account account, Roster.Item roster_item) {
-            updated_roster_item(account, new Jid(roster_item.jid), roster_item);
-        }
+    private void on_roster_item_updated(Account account, Roster.Item roster_item) {
+        updated_roster_item(account, new Jid(roster_item.jid), roster_item);
     }
+}
+
 }
\ No newline at end of file