ban can be disabled in Config.java

1 files changed, 6 insertions, 2 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
index 8d9fefe05..6465d0364 100644
--- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
@@ -423,14 +423,18 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
                             removeAdminPrivileges.setVisible(true);
                         }
                     } else {
-                        removeFromRoom.setVisible(true);
+                        if (!Config.DISABLE_BAN || mConversation.getMucOptions().membersOnly()) {
+                            removeFromRoom.setVisible(true);
+                        }
                     }
                     if (user.getAffiliation() == MucOptions.Affiliation.NONE) {
                         giveMembership.setVisible(true);
                     } else {
                         removeMembership.setVisible(true);
                     }
-                    banFromConference.setVisible(true);
+                    if (!Config.DISABLE_BAN) {
+                        banFromConference.setVisible(true);
+                    }
                 }
             } else {