fix 'allow pm' checkbox default

Daniel Gultsch created 2 years ago

Change summary

src/main/java/eu/siacs/conversations/entities/MucOptions.java      | 6 
src/main/java/eu/siacs/conversations/ui/util/MucConfiguration.java | 2 
2 files changed, 7 insertions(+), 1 deletion(-)

Detailed changes

src/main/java/eu/siacs/conversations/entities/MucOptions.java

@@ -18,6 +18,7 @@ import eu.siacs.conversations.xmpp.forms.Field;
 import eu.siacs.conversations.xmpp.pep.Avatar;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -192,6 +193,11 @@ public class MucOptions {
         }
     }
 
+    public boolean allowPmRaw() {
+        final Field field = getRoomInfoForm().getFieldByName("muc#roomconfig_allowpm");
+        return  field == null || Arrays.asList("anyone","participants").contains(field.getValue());
+    }
+
     public boolean participating() {
         return self.getRole().ranks(Role.PARTICIPANT) || !moderated();
     }

src/main/java/eu/siacs/conversations/ui/util/MucConfiguration.java

@@ -57,7 +57,7 @@ public class MucConfiguration {
                             mucOptions.nonanonymous(),
                             mucOptions.participantsCanChangeSubject(),
                             mucOptions.moderated(),
-                            mucOptions.allowPm()
+                            mucOptions.allowPmRaw()
                         };
                 options =
                         new Option[] {