Smooth over some MUC form differences between ejabberd and Prosody

Stephen Paul Weber created 2 years ago

Change summary

src/main/java/eu/siacs/conversations/entities/MucOptions.java          | 3 
src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java | 1 
2 files changed, 3 insertions(+), 1 deletion(-)

Detailed changes

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

@@ -176,7 +176,8 @@ public class MucOptions {
     }
 
     public boolean participantsCanChangeSubject() {
-        final Field field = getRoomInfoForm().getFieldByName("muc#roominfo_changesubject");
+        Field field = getRoomInfoForm().getFieldByName("muc#roomconfig_changesubject");
+        if (field == null) field = getRoomInfoForm().getFieldByName("muc#roominfo_changesubject");
         return field != null && "1".equals(field.getValue());
     }
 

src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java

@@ -155,6 +155,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
             builder.setPositiveButton(R.string.confirm, (dialog, which) -> {
                 Bundle options = configuration.toBundle(values);
                 options.putString("muc#roomconfig_persistentroom", "1");
+                options.putString("{http://prosody.im/protocol/muc}roomconfig_allowmemberinvites", options.getString("muc#roomconfig_allowinvites"));
                 xmppConnectionService.pushConferenceConfiguration(mConversation,
                         options,
                         ConferenceDetailsActivity.this);