disable offline messages. postpone prekey handling until after mam catchup

2 files changed, 16 insertions, 2 deletions

diff --git a/src/main/java/de/pixart/messenger/generator/IqGenerator.java b/src/main/java/de/pixart/messenger/generator/IqGenerator.java
index ef2c10e6b..8275d7762 100644
--- a/src/main/java/de/pixart/messenger/generator/IqGenerator.java
+++ b/src/main/java/de/pixart/messenger/generator/IqGenerator.java
@@ -45,8 +45,7 @@ public class IqGenerator extends AbstractGenerator {
         final IqPacket packet = new IqPacket(IqPacket.TYPE.RESULT);
         packet.setId(request.getId());
         packet.setTo(request.getFrom());
-        final Element query = packet.addChild("query",
-                "http://jabber.org/protocol/disco#info");
+        final Element query = packet.addChild("query", "http://jabber.org/protocol/disco#info");
         query.setAttribute("node", request.query().getAttribute("node"));
         final Element identity = query.addChild("identity");
         identity.setAttribute("category", "client");
@@ -58,6 +57,12 @@ public class IqGenerator extends AbstractGenerator {
         return packet;
     }
 
+    public IqPacket purgeOfflineMessages() {
+        final IqPacket packet = new IqPacket(IqPacket.TYPE.SET);
+        packet.addChild("offline", Namespace.FLEXIBLE_OFFLINE_MESSAGE_RETRIEVAL).addChild("purge");
+        return packet;
+    }
+
     public IqPacket versionResponse(final IqPacket request) {
         final IqPacket packet = request.generateResponse(IqPacket.TYPE.RESULT);
         Element query = packet.query("jabber:iq:version");
diff --git a/src/main/java/de/pixart/messenger/generator/MessageGenerator.java b/src/main/java/de/pixart/messenger/generator/MessageGenerator.java
index acdaedcbe..b795997e8 100644
--- a/src/main/java/de/pixart/messenger/generator/MessageGenerator.java
+++ b/src/main/java/de/pixart/messenger/generator/MessageGenerator.java
@@ -89,6 +89,15 @@ public class MessageGenerator extends AbstractGenerator {
         return packet;
     }
 
+    public MessagePacket generateKeyTransportMessage(Jid to, XmppAxolotlMessage axolotlMessage) {
+        MessagePacket packet = new MessagePacket();
+        packet.setType(MessagePacket.TYPE_CHAT);
+        packet.setTo(to);
+        packet.setAxolotlMessage(axolotlMessage.toElement());
+        packet.addChild("store", "urn:xmpp:hints");
+        return packet;
+    }
+
     private static boolean recipientSupportsOmemo(Message message) {
         Contact c = message.getContact();
         return c != null && c.getPresences().allOrNonSupport(AxolotlService.PEP_DEVICE_LIST_NOTIFY);