SRV records for XMPP over TLS

2 files changed, 8 insertions, 5 deletions

diff --git a/libdino/src/entity/conversation.vala b/libdino/src/entity/conversation.vala
index 40bff1c2..fa78c619 100644
--- a/libdino/src/entity/conversation.vala
+++ b/libdino/src/entity/conversation.vala
@@ -73,17 +73,19 @@ public class Conversation : Object {
                 .value(db.conversation.jid_id, db.get_jid_id(counterpart))
                 .value(db.conversation.type_, type_)
                 .value(db.conversation.encryption, encryption)
-                .value(db.conversation.read_up_to, read_up_to.id)
-                .value(db.conversation.active, active);
+                .value(db.conversation.active, active)
+                .value(db.conversation.notification, notify_setting)
+                .value(db.conversation.send_typing, send_typing)
+                .value(db.conversation.send_marker, send_marker);
+        if (read_up_to != null) {
+            insert.value(db.conversation.read_up_to, read_up_to.id);
+        }
         if (counterpart.is_full()) {
             insert.value(db.conversation.resource, counterpart.resourcepart);
         }
         if (last_active != null) {
             insert.value(db.conversation.last_active, (long) last_active.to_unix());
         }
-        insert.value(db.conversation.notification, notify_setting);
-        insert.value(db.conversation.send_typing, send_typing);
-        insert.value(db.conversation.send_marker, send_marker);
         id = (int) insert.perform();
         notify.connect(on_update);
     }
diff --git a/libdino/src/service/module_manager.vala b/libdino/src/service/module_manager.vala
index 9f2a05d0..b10765f1 100644
--- a/libdino/src/service/module_manager.vala
+++ b/libdino/src/service/module_manager.vala
@@ -46,6 +46,7 @@ public class ModuleManager {
         lock(module_map) {
             module_map[account] = new ArrayList<Core.XmppStreamModule>();
             module_map[account].add(new Tls.Module());
+            module_map[account].add(new Xep.SrvRecordsTls.Module());
             module_map[account].add(new Session.Module());
             module_map[account].add(new Roster.Module());
             module_map[account].add(new Xep.ServiceDiscovery.Module.with_identity("client", "pc"));