From 0449a20665af917bb1f14d91f0dc5b9a0fb93f69 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 8 Oct 2016 18:53:09 +0200
Subject: fetch new conference configuration on every conf update

---
 .../de/pixart/messenger/parser/MessageParser.java  | 37 +++++++++++-----------
 1 file changed, 18 insertions(+), 19 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/parser/MessageParser.java')

diff --git a/src/main/java/de/pixart/messenger/parser/MessageParser.java b/src/main/java/de/pixart/messenger/parser/MessageParser.java
index f91fcf977..4b6428514 100644
--- a/src/main/java/de/pixart/messenger/parser/MessageParser.java
+++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java
@@ -583,26 +583,25 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
 				}
 			}
 			if (conversation != null && mucUserElement != null && from.isBareJid()) {
-				if (mucUserElement.hasChild("status")) {
-					for (Element child : mucUserElement.getChildren()) {
-						if (child.getName().equals("status")
-								&& MucOptions.STATUS_CODE_ROOM_CONFIG_CHANGED.equals(child.getAttribute("code"))) {
-							mXmppConnectionService.fetchConferenceConfiguration(conversation);
-						}
-					}
-				} else if (mucUserElement.hasChild("item")) {
-					for(Element child : mucUserElement.getChildren()) {
-						if ("item".equals(child.getName())) {
-							MucOptions.User user = AbstractParser.parseItem(conversation,child);
-							Log.d(Config.LOGTAG,account.getJid()+": changing affiliation for "
-									+user.getRealJid()+" to "+user.getAffiliation()+" in "
-									+conversation.getJid().toBareJid());
-							if (!user.realJidMatchesAccount()) {
-								conversation.getMucOptions().addUser(user);
-								mXmppConnectionService.getAvatarService().clear(conversation);
-								mXmppConnectionService.updateMucRosterUi();
-								mXmppConnectionService.updateConversationUi();
+                for (Element child : mucUserElement.getChildren()) {
+                    if ("status".equals(child.getName())) {
+                        try {
+                            int code = Integer.parseInt(child.getAttribute("code"));
+                            if ((code >= 170 && code <= 174) || (code >= 102 && code <= 104)) {
+                                mXmppConnectionService.fetchConferenceConfiguration(conversation);
+                                break;
 							}
+                        } catch (Exception e) {
+                            //ignored
+                        }
+                    } else if ("item".equals(child.getName())) {
+                        MucOptions.User user = AbstractParser.parseItem(conversation,child);
+                        Log.d(Config.LOGTAG,account.getJid()+": changing affiliation for " + user.getRealJid()+" to " + user.getAffiliation() + " in " + conversation.getJid().toBareJid());
+                        if (!user.realJidMatchesAccount()) {
+                            conversation.getMucOptions().addUser(user);
+                            mXmppConnectionService.getAvatarService().clear(conversation);
+                            mXmppConnectionService.updateMucRosterUi();
+                            mXmppConnectionService.updateConversationUi();
 						}
 					}
 				}
-- 
cgit v1.2.3