diff options
Diffstat (limited to '')
4 files changed, 28 insertions, 25 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/MucOptions.java b/src/main/java/de/pixart/messenger/entities/MucOptions.java index e64f78648..12987cfc9 100644 --- a/src/main/java/de/pixart/messenger/entities/MucOptions.java +++ b/src/main/java/de/pixart/messenger/entities/MucOptions.java @@ -397,6 +397,11 @@ public class MucOptions { return self.getRole().ranks(Role.MODERATOR) || (field != null && "1".equals(field.getValue())); } + public boolean allowPm() { + Field field = this.form.getFieldByName("muc#roomconfig_allowpm"); + return field == null || "1".equals(field.getValue()); + } + public boolean participating() { return !online() || self.getRole().ranks(Role.PARTICIPANT) diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java index d7f022d3e..55a7ad85e 100644 --- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java @@ -477,7 +477,11 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers } return true; case R.id.send_private_message: - privateMsgInMuc(mConversation, mSelectedUser.getName()); + if (mConversation.getMucOptions().allowPm()) { + privateMsgInMuc(mConversation, mSelectedUser.getName()); + } else { + Toast.makeText(this, R.string.private_messages_are_disabled, Toast.LENGTH_SHORT).show(); + } return true; case R.id.invite: xmppConnectionService.directInvite(mConversation, jid); diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index 90a3057ba..72ab218e2 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -77,7 +77,6 @@ import de.pixart.messenger.ui.XmppActivity.OnPresenceSelected; import de.pixart.messenger.ui.XmppActivity.OnValueEdited; import de.pixart.messenger.ui.adapter.MessageAdapter; import de.pixart.messenger.ui.adapter.MessageAdapter.OnContactPictureClicked; -import de.pixart.messenger.ui.adapter.MessageAdapter.OnContactPictureLongClicked; import de.pixart.messenger.ui.widget.EditMessage; import de.pixart.messenger.utils.MessageUtils; import de.pixart.messenger.utils.NickValidityChecker; @@ -638,34 +637,28 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa } } }); - messageListAdapter - .setOnContactPictureLongClicked(new OnContactPictureLongClicked() { - - @Override - public void onContactPictureLongClicked(Message message) { - if (message.getStatus() <= Message.STATUS_RECEIVED) { - if (message.getConversation().getMode() == Conversation.MODE_MULTI) { - Jid user = message.getCounterpart(); - if (user != null && !user.isBareJid()) { - if (message.getConversation().getMucOptions().isUserInRoom(user)) { - privateMessageWith(user); - } else { - Toast.makeText(activity, activity.getString(R.string.user_has_left_conference, user.getResourcepart()), Toast.LENGTH_SHORT).show(); - } - } - } + messageListAdapter.setOnContactPictureLongClicked(message -> { + if (message.getStatus() <= Message.STATUS_RECEIVED) { + if (message.getConversation().getMode() == Conversation.MODE_MULTI) { + final MucOptions mucOptions = conversation.getMucOptions(); + if (!mucOptions.allowPm()) { + Toast.makeText(activity, R.string.private_messages_are_disabled, Toast.LENGTH_SHORT).show(); + return; + } + Jid user = message.getCounterpart(); + if (user != null && !user.isBareJid()) { + if (mucOptions.isUserInRoom(user)) { + privateMessageWith(user); } else { - activity.showQrCode(); + Toast.makeText(activity, activity.getString(R.string.user_has_left_conference, user.getResourcepart()), Toast.LENGTH_SHORT).show(); } } - }); - messageListAdapter.setOnQuoteListener(new MessageAdapter.OnQuoteListener() { - - @Override - public void onQuote(String text) { - quoteText(text); + } + } else { + activity.showQrCode(); } }); + messageListAdapter.setOnQuoteListener(text -> quoteText(text)); messagesView.setAdapter(messageListAdapter); registerForContextMenu(messagesView); diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index b1b7e4248..04c94db8b 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -747,4 +747,5 @@ <string name="pref_use_bundled_emoji_summary">Use the integrated emoji library instead of using your devices ones. Changes will be available after reopening the app.</string> <string name="invalid_muc_nick">Invalid nickname</string> <string name="title_activity_share_via_account">Share via account</string> + <string name="private_messages_are_disabled">Private messages are disabled</string> </resources> |