Add JID interning

7 files changed, 12 insertions, 12 deletions

diff --git a/libdino/src/service/call_state.vala b/libdino/src/service/call_state.vala
index a87aee0a..3caf5071 100644
--- a/libdino/src/service/call_state.vala
+++ b/libdino/src/service/call_state.vala
@@ -354,7 +354,7 @@ public class Dino.CallState : Object {
         }
 
         if (cim_call_id == null) cim_call_id = Xmpp.random_uuid();
-        muc_jid = new Jid("%08x@".printf(Random.next_int()) + muc_jid.to_string()); // TODO longer?
+        muc_jid = Jid.from_string("%08x@".printf(Random.next_int()) + muc_jid.to_string()); // TODO longer?
 
         debug("[%s] Converting call to groupcall %s", call.account.bare_jid.to_string(), muc_jid.to_string());
         yield join_group_call(muc_jid);
diff --git a/libdino/src/service/calls.vala b/libdino/src/service/calls.vala
index a2d25655..e0e37ffd 100644
--- a/libdino/src/service/calls.vala
+++ b/libdino/src/service/calls.vala
@@ -425,7 +425,7 @@ namespace Dino {
 
                         string? room_jid_str = join_method_node.get_attribute("room");
                         if (room_jid_str == null) return;
-                        Jid room_jid = new Jid(room_jid_str);
+                        Jid room_jid = Jid.from_string(room_jid_str);
                         call_state = create_recv_muji_call(account, call_id, from_jid, room_jid, message_stanza.type_);
 
                         multiparty = true;
diff --git a/libdino/src/service/database.vala b/libdino/src/service/database.vala
index 7a5b940a..847d87f6 100644
--- a/libdino/src/service/database.vala
+++ b/libdino/src/service/database.vala
@@ -833,7 +833,7 @@ public class Database : Qlite.Database {
         } else {
             string? bare_jid = jid.select({jid.bare_jid}).with(jid.id, "=", id)[jid.bare_jid];
             if (bare_jid != null) {
-                Jid jid_parsed = new Jid(bare_jid);
+                Jid jid_parsed = Jid.from_string(bare_jid);
                 jid_table_cache[id] = jid_parsed;
 
                 // Only store fully normalized Jids for reverse lookup
diff --git a/libdino/src/service/history_sync.vala b/libdino/src/service/history_sync.vala
index 190284e0..9bd3f54f 100644
--- a/libdino/src/service/history_sync.vala
+++ b/libdino/src/service/history_sync.vala
@@ -505,7 +505,7 @@ public class Dino.HistorySync {
         foreach (Row row in db.mam_catchup.select().with(db.mam_catchup.account_id, "=", account.id)) {
             var mam_range = new MamRange();
             mam_range.id = row[db.mam_catchup.id];
-            mam_range.server_jid = new Jid(row[db.mam_catchup.server_jid]);
+            mam_range.server_jid = Jid.from_string(row[db.mam_catchup.server_jid]);
             mam_range.from_time = row[db.mam_catchup.from_time];
             mam_range.from_id = row[db.mam_catchup.from_id];
             mam_range.from_end = row[db.mam_catchup.from_end];
diff --git a/libdino/src/service/reactions.vala b/libdino/src/service/reactions.vala
index f6050d28..16849c68 100644
--- a/libdino/src/service/reactions.vala
+++ b/libdino/src/service/reactions.vala
@@ -210,7 +210,7 @@ public class Dino.Reactions : StreamInteractionModule, Object {
 
             Jid jid = null;
             if (!db.jid.bare_jid.is_null(row)) {
-                jid = new Jid(row[db.jid.bare_jid]);
+                jid = Jid.from_string(row[db.jid.bare_jid]);
             } else if (!db.occupantid.occupant_id.is_null(row)) {
                 if (row[db.occupantid.occupant_id] == own_occupant_id) {
                     jid = account.bare_jid;
diff --git a/libdino/src/service/roster_manager.vala b/libdino/src/service/roster_manager.vala
index 7cd844da..c9bafb24 100644
--- a/libdino/src/service/roster_manager.vala
+++ b/libdino/src/service/roster_manager.vala
@@ -93,7 +93,7 @@ public class RosterStoreImpl : Roster.Storage, Object {
         foreach (Qlite.Row row in db.roster.select().with(db.roster.account_id, "=", account.id)) {
             try {
                 Roster.Item item = new Roster.Item();
-                item.jid = new Jid(row[db.roster.jid]);
+                item.jid = Jid.from_string(row[db.roster.jid]);
                 item.name = row[db.roster.handle];
                 item.subscription = row[db.roster.subscription];
                 items[item.jid] = item;
diff --git a/libdino/src/service/search_processor.vala b/libdino/src/service/search_processor.vala
index 6e7d4993..2b5ebe49 100644
--- a/libdino/src/service/search_processor.vala
+++ b/libdino/src/service/search_processor.vala
@@ -134,9 +134,9 @@ public class SearchProcessor : StreamInteractionModule, Object {
                 foreach(Row chat in chats) {
                     try {
                         if (suggestions.size == 0) {
-                            suggestions.add(new SearchSuggestion(new Conversation.from_row(db, chat), new Jid(chat[db.jid.bare_jid]), "from:"+chat[db.jid.bare_jid], after_prev_space, next_space));
+                            suggestions.add(new SearchSuggestion(new Conversation.from_row(db, chat), Jid.from_string(chat[db.jid.bare_jid]), "from:"+chat[db.jid.bare_jid], after_prev_space, next_space));
                         }
-                        suggestions.add(new SearchSuggestion(new Conversation.from_row(db, chat), new Jid(chat[db.account.bare_jid]), "from:"+chat[db.account.bare_jid], after_prev_space, next_space));
+                        suggestions.add(new SearchSuggestion(new Conversation.from_row(db, chat), Jid.from_string(chat[db.account.bare_jid]), "from:"+chat[db.account.bare_jid], after_prev_space, next_space));
                     } catch (InvalidJidError e) {
                         warning("Ignoring search suggestion with invalid Jid: %s", e.message);
                     }
@@ -160,7 +160,7 @@ public class SearchProcessor : StreamInteractionModule, Object {
                     .limit(5);
                 foreach(Row msg in msgs) {
                     try {
-                        suggestions.add(new SearchSuggestion(new Conversation.from_row(db, msg), new Jid(current_in).with_resource(msg[db.message.counterpart_resource]), "from:"+msg[db.message.counterpart_resource], after_prev_space, next_space));
+                        suggestions.add(new SearchSuggestion(new Conversation.from_row(db, msg), Jid.from_string(current_in).with_resource(msg[db.message.counterpart_resource]), "from:"+msg[db.message.counterpart_resource], after_prev_space, next_space));
                     } catch (InvalidJidError e) {
                         warning("Ignoring search suggestion with invalid Jid: %s", e.message);
                     }
@@ -190,7 +190,7 @@ public class SearchProcessor : StreamInteractionModule, Object {
                 .limit(limit);
             foreach(Row chat in chats) {
                 try {
-                    suggestions.add(new SearchSuggestion(new Conversation.from_row(db, chat), new Jid(chat[db.jid.bare_jid]), "with:"+chat[db.jid.bare_jid], after_prev_space, next_space) { order = chat[db.conversation.last_active]});
+                    suggestions.add(new SearchSuggestion(new Conversation.from_row(db, chat), Jid.from_string(chat[db.jid.bare_jid]), "with:"+chat[db.jid.bare_jid], after_prev_space, next_space) { order = chat[db.conversation.last_active]});
                 } catch (InvalidJidError e) {
                     warning("Ignoring search suggestion with invalid Jid: %s", e.message);
                 }
@@ -208,7 +208,7 @@ public class SearchProcessor : StreamInteractionModule, Object {
                     .limit(limit - suggestions.size);
                 foreach(Row chat in chats) {
                     try {
-                        suggestions.add(new SearchSuggestion(new Conversation.from_row(db, chat), new Jid(chat[db.jid.bare_jid]).with_resource(chat[db.conversation.resource]), "with:"+chat[db.jid.bare_jid]+"/"+chat[db.conversation.resource], after_prev_space, next_space) { order = chat[db.conversation.last_active]});
+                        suggestions.add(new SearchSuggestion(new Conversation.from_row(db, chat), Jid.from_string(chat[db.jid.bare_jid]).with_resource(chat[db.conversation.resource]), "with:"+chat[db.jid.bare_jid]+"/"+chat[db.conversation.resource], after_prev_space, next_space) { order = chat[db.conversation.last_active]});
                     } catch (InvalidJidError e) {
                         warning("Ignoring search suggestion with invalid Jid: %s", e.message);
                     }
@@ -235,7 +235,7 @@ public class SearchProcessor : StreamInteractionModule, Object {
                 .limit(limit);
             foreach(Row chat in groupchats) {
                 try {
-                    suggestions.add(new SearchSuggestion(new Conversation.from_row(db, chat), new Jid(chat[db.jid.bare_jid]), "in:"+chat[db.jid.bare_jid], after_prev_space, next_space));
+                    suggestions.add(new SearchSuggestion(new Conversation.from_row(db, chat), Jid.from_string(chat[db.jid.bare_jid]), "in:"+chat[db.jid.bare_jid], after_prev_space, next_space));
                 } catch (InvalidJidError e) {
                     warning("Ignoring search suggestion with invalid Jid: %s", e.message);
                 }