sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ban can be disabled in Config.java (#3016)

This commit is contained in:
ChaosKid42 2018-05-05 19:40:43 +02:00 committed by Daniel Gultsch
parent c113f37713
commit 1fcd69ce40
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/Config.java
View File

@ -52,6 +52,8 @@ public final class Config {
public static final boolean ALWAYS_NOTIFY_BY_DEFAULT = false;
public static final boolean DISABLE_BAN = false; // disables the ability to ban users from rooms
public static final int PING_MAX_INTERVAL = 300;
public static final int IDLE_PING_INTERVAL = 600; //540 is minimum according to docs;
public static final int PING_MIN_INTERVAL = 30;

8
src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
View File

@ -378,9 +378,13 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
} else {
removeMembership.setVisible(true);
}
banFromConference.setVisible(true);
if (!Config.DISABLE_BAN) {
banFromConference.setVisible(true);
}
} else {
removeFromRoom.setVisible(true);
if (!Config.DISABLE_BAN || mConversation.getMucOptions().membersOnly()) {
removeFromRoom.setVisible(true);
}
}
if (user.getAffiliation() != MucOptions.Affiliation.ADMIN) {
giveAdminPrivileges.setVisible(true);