From 4220fa948b731501c27e8c49774a563cbc07063a Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 12 Sep 2015 10:42:56 +0200
Subject: added mp4 to well known extensions. fixes #1403

---
 src/main/java/eu/siacs/conversations/entities/Transferable.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/eu/siacs/conversations/entities')

diff --git a/src/main/java/eu/siacs/conversations/entities/Transferable.java b/src/main/java/eu/siacs/conversations/entities/Transferable.java
index 2db6e3c98..016c81bdf 100644
--- a/src/main/java/eu/siacs/conversations/entities/Transferable.java
+++ b/src/main/java/eu/siacs/conversations/entities/Transferable.java
@@ -4,7 +4,7 @@ public interface Transferable {
 
 	String[] VALID_IMAGE_EXTENSIONS = {"webp", "jpeg", "jpg", "png", "jpe"};
 	String[] VALID_CRYPTO_EXTENSIONS = {"pgp", "gpg", "otr"};
-	String[] WELL_KNOWN_EXTENSIONS = {"pdf","m4a"};
+	String[] WELL_KNOWN_EXTENSIONS = {"pdf","m4a","mp4"};
 
 	int STATUS_UNKNOWN = 0x200;
 	int STATUS_CHECKING = 0x201;
-- 
cgit v1.2.3


From 96575d6290d3fc28c79ec37c493e1062735cbf41 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 13 Sep 2015 17:13:46 +0200
Subject: added possibiltiy to set conferences as moderated (only visible in
 advanced mode)

---
 .../siacs/conversations/entities/MucOptions.java   | 26 +++++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/entities')

diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index 52a862efa..cf49cf65e 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -23,7 +23,7 @@ public class MucOptions {
 		OUTCAST("outcast", 0, R.string.outcast),
 		NONE("none", 1, R.string.no_affiliation);
 
-		private Affiliation(String string, int rank, int resId) {
+		Affiliation(String string, int rank, int resId) {
 			this.string = string;
 			this.resId = resId;
 			this.rank = rank;
@@ -52,18 +52,20 @@ public class MucOptions {
 	}
 
 	public enum Role {
-		MODERATOR("moderator", R.string.moderator),
-		VISITOR("visitor", R.string.visitor),
-		PARTICIPANT("participant", R.string.participant),
-		NONE("none", R.string.no_role);
+		MODERATOR("moderator", R.string.moderator,3),
+		VISITOR("visitor", R.string.visitor,1),
+		PARTICIPANT("participant", R.string.participant,2),
+		NONE("none", R.string.no_role,0);
 
-		private Role(String string, int resId) {
+		private Role(String string, int resId, int rank) {
 			this.string = string;
 			this.resId = resId;
+			this.rank = rank;
 		}
 
 		private String string;
 		private int resId;
+		private int rank;
 
 		public int getResId() {
 			return resId;
@@ -73,6 +75,10 @@ public class MucOptions {
 		public String toString() {
 			return this.string;
 		}
+
+		public boolean ranks(Role role) {
+			return rank >= role.rank;
+		}
 	}
 
 	public static final int ERROR_NO_ERROR = 0;
@@ -233,6 +239,10 @@ public class MucOptions {
 		 return !membersOnly() || self.getAffiliation().ranks(Affiliation.ADMIN);
 	}
 
+	public boolean participating() {
+		return !online() || self.getRole().ranks(Role.PARTICIPANT);
+	}
+
 	public boolean membersOnly() {
 		return hasFeature("muc_membersonly");
 	}
@@ -245,6 +255,10 @@ public class MucOptions {
 		return hasFeature("muc_persistent");
 	}
 
+	public boolean moderated() {
+		return hasFeature("muc_moderated");
+	}
+
 	public void deleteUser(String name) {
 		for (int i = 0; i < users.size(); ++i) {
 			if (users.get(i).getName().equals(name)) {
-- 
cgit v1.2.3