From ff1b7567d122aaa22a191f0fc7a1cc270bd57a0e Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 27 Jan 2018 21:57:40 +0100
Subject: allow axolotl header to be empty in empty mucs

---
 .../java/de/pixart/messenger/crypto/axolotl/AxolotlService.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java')

diff --git a/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
index 6970109b8..6721a7975 100644
--- a/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
@@ -1211,11 +1211,11 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
     }
 
     @Nullable
-    private boolean buildHeader(XmppAxolotlMessage axolotlMessage, Conversation conversation) {
-
-        Set<XmppAxolotlSession> remoteSessions = findSessionsForConversation(conversation);
+    private boolean buildHeader(XmppAxolotlMessage axolotlMessage, Conversation c) {
+        Set<XmppAxolotlSession> remoteSessions = findSessionsForConversation(c);
+        final boolean acceptEmpty = c.getMode() == Conversation.MODE_MULTI && c.getMucOptions().getUserCount() == 0;
         Collection<XmppAxolotlSession> ownSessions = findOwnSessions();
-        if (remoteSessions.isEmpty()) {
+        if (remoteSessions.isEmpty() && !acceptEmpty) {
             return false;
         }
         for (XmppAxolotlSession session : remoteSessions) {
-- 
cgit v1.2.3