Do not expose UUID lib dependency outside vala-xmpp library

6 files changed, 17 insertions, 11 deletions

diff --git a/vala-xmpp/src/core/stanza_writer.vala b/vala-xmpp/src/core/stanza_writer.vala
index 625f42e2..26524d7b 100644
--- a/vala-xmpp/src/core/stanza_writer.vala
+++ b/vala-xmpp/src/core/stanza_writer.vala
@@ -2,8 +2,6 @@ namespace Xmpp.Core {
 public class StanzaWriter {
     private OutputStream output;
 
-    private NamespaceState ns_state = new NamespaceState();
-
     public StanzaWriter.for_stream(OutputStream output) {
         this.output = output;
     }
diff --git a/vala-xmpp/src/module/iq/stanza.vala b/vala-xmpp/src/module/iq/stanza.vala
index 99d589ff..561c5866 100644
--- a/vala-xmpp/src/module/iq/stanza.vala
+++ b/vala-xmpp/src/module/iq/stanza.vala
@@ -10,12 +10,12 @@ public class Stanza : Xmpp.Stanza {
     public const string TYPE_RESULT = "result";
     public const string TYPE_SET = "set";
 
-    private Stanza(string id = UUID.generate_random_unparsed()) {
+    private Stanza(string? id = null) {
         base.outgoing(new StanzaNode.build("iq"));
-        this.id = id;
+        this.id = id ?? random_uuid();
     }
 
-    public Stanza.get(StanzaNode stanza_node, string id = UUID.generate_random_unparsed()) {
+    public Stanza.get(StanzaNode stanza_node, string? id = null) {
         this(id);
         this.type_ = TYPE_GET;
         stanza.put_node(stanza_node);
@@ -29,7 +29,7 @@ public class Stanza : Xmpp.Stanza {
         }
     }
 
-    public Stanza.set(StanzaNode stanza_node, string id = UUID.generate_random_unparsed()) {
+    public Stanza.set(StanzaNode stanza_node, string? id = null) {
         this(id);
         type_ = TYPE_SET;
         stanza.put_node(stanza_node);
diff --git a/vala-xmpp/src/module/message/stanza.vala b/vala-xmpp/src/module/message/stanza.vala
index 811fbd22..8a9064a5 100644
--- a/vala-xmpp/src/module/message/stanza.vala
+++ b/vala-xmpp/src/module/message/stanza.vala
@@ -33,9 +33,9 @@ public class Stanza : Xmpp.Stanza {
         }
     }
 
-    public Stanza(string id = UUID.generate_random_unparsed()) {
+    public Stanza(string? id = null) {
         base.outgoing(new StanzaNode.build("message"));
-        stanza.set_attribute(ATTRIBUTE_ID, id);
+        stanza.set_attribute(ATTRIBUTE_ID, id ?? random_uuid());
     }
 
     public Stanza.from_stanza(StanzaNode stanza_node, string my_jid) {
diff --git a/vala-xmpp/src/module/presence/stanza.vala b/vala-xmpp/src/module/presence/stanza.vala
index 3dc036e5..9ad8f791 100644
--- a/vala-xmpp/src/module/presence/stanza.vala
+++ b/vala-xmpp/src/module/presence/stanza.vala
@@ -80,9 +80,9 @@ public class Stanza : Xmpp.Stanza {
         set { base.type_ = value; }
     }
 
-    public Stanza(string id = UUID.generate_random_unparsed()) {
+    public Stanza(string? id = null) {
         stanza = new StanzaNode.build("presence");
-        this.id = id;
+        this.id = id ?? random_uuid();
     }
 
     public Stanza.from_stanza(StanzaNode stanza_node, string my_jid) {
diff --git a/vala-xmpp/src/module/roster/module.vala b/vala-xmpp/src/module/roster/module.vala
index 9fa23a55..c8b09710 100644
--- a/vala-xmpp/src/module/roster/module.vala
+++ b/vala-xmpp/src/module/roster/module.vala
@@ -95,7 +95,7 @@ namespace Xmpp.Roster {
         internal override string get_id() { return ID; }
 
         private void roster_get(XmppStream stream) {
-            Flag.get_flag(stream).iq_id = UUID.generate_random_unparsed();
+            Flag.get_flag(stream).iq_id = random_uuid();
             StanzaNode query_node = new StanzaNode.build("query", NS_URI).add_self_xmlns();
             Iq.Stanza iq = new Iq.Stanza.get(query_node, Flag.get_flag(stream).iq_id);
             Iq.Module.get_module(stream).send_iq(stream, iq, new IqResponseListenerImpl());
diff --git a/vala-xmpp/src/module/util.vala b/vala-xmpp/src/module/util.vala
index 4d762883..65a9b261 100644
--- a/vala-xmpp/src/module/util.vala
+++ b/vala-xmpp/src/module/util.vala
@@ -10,4 +10,12 @@ namespace Xmpp {
     string? get_resource_part(string jid) {
         return jid.split("/")[1];
     }
+
+    public string random_uuid() {
+        uint8[] rand = new uint8[16];
+        char[] str = new char[37];
+        UUID.generate_random(rand);
+        UUID.unparse_upper(rand, str);
+        return (string) str;
+    }
 }
\ No newline at end of file