fixed parsing of muc status messages in new message parser

Daniel Gultsch created 10 years ago

Change summary

src/main/java/eu/siacs/conversations/parser/MessageParser.java | 24 +++-
1 file changed, 18 insertions(+), 6 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/parser/MessageParser.java

@@ -364,13 +364,25 @@ public class MessageParser extends AbstractParser implements
 				mXmppConnectionService.getNotificationService().push(message);
 			}
 		} else { //no body
-			if (packet.hasChild("subject") && isTypeGroupChat) {
+			if (isTypeGroupChat) {
 				Conversation conversation = mXmppConnectionService.find(account, from.toBareJid());
-				if (conversation != null && conversation.getMode() == Conversation.MODE_MULTI) {
-					conversation.setHasMessagesLeftOnServer(conversation.countMessages() > 0);
-					conversation.getMucOptions().setSubject(packet.findChildContent("subject"));
-					mXmppConnectionService.updateConversationUi();
-					return;
+				if (packet.hasChild("subject")) {
+					if (conversation != null && conversation.getMode() == Conversation.MODE_MULTI) {
+						conversation.setHasMessagesLeftOnServer(conversation.countMessages() > 0);
+						conversation.getMucOptions().setSubject(packet.findChildContent("subject"));
+						mXmppConnectionService.updateConversationUi();
+						return;
+					}
+				}
+
+				final Element x = packet.findChild("x", "http://jabber.org/protocol/muc#user");
+				if (conversation != null && x != null && from.isBareJid()) {
+					for (Element child : x.getChildren()) {
+						if (child.getName().equals("status")
+								&& MucOptions.STATUS_CODE_ROOM_CONFIG_CHANGED.equals(child.getAttribute("code"))) {
+							mXmppConnectionService.fetchConferenceConfiguration(conversation);
+						}
+					}
 				}
 			}
 		}