Move Jid class to xmpp-vala, partially refactor namespace

1 files changed, 4 insertions, 4 deletions

diff --git a/plugins/openpgp/src/stream_flag.vala b/plugins/openpgp/src/stream_flag.vala
index 165327b9..8593fa9d 100644
--- a/plugins/openpgp/src/stream_flag.vala
+++ b/plugins/openpgp/src/stream_flag.vala
@@ -1,18 +1,18 @@
 using Gee;
 
 using Xmpp;
-using Xmpp.Core;
+using Xmpp;
 
 namespace Dino.Plugins.OpenPgp {
 
 public class Flag : XmppStreamFlag {
     public static FlagIdentity<Flag> IDENTITY = new FlagIdentity<Flag>(NS_URI, "pgp");
 
-    public HashMap<string, string> key_ids = new HashMap<string, string>();
+    public HashMap<Jid, string> key_ids = new HashMap<Jid, string>(Jid.hash_bare_func, Jid.equals_bare_func);
 
-    public string? get_key_id(string jid) { return key_ids[get_bare_jid(jid)]; }
+    public string? get_key_id(Jid jid) { return key_ids[jid]; }
 
-    public void set_key_id(string jid, string key) { key_ids[get_bare_jid(jid)] = key; }
+    public void set_key_id(Jid jid, string key) { key_ids[jid] = key; }
 
     public override string get_ns() { return NS_URI; }