Skip to content

Commit

Permalink
Hide prpr and repeat if not in chat
Browse files Browse the repository at this point in the history
  • Loading branch information
NekoInverter authored and NekoInverter committed Jun 10, 2020
1 parent 28df060 commit 69c2c45
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14832,7 +14832,7 @@ private void createMenu(View v, boolean single, boolean listView, float x, float
icons.add(R.drawable.menu_saved);
}
boolean allowRepeat = currentUser != null
|| (currentChat != null && ChatObject.canSendMessages(currentChat));
|| (currentChat != null && !ChatObject.isNotInChat(currentChat) && ChatObject.canSendMessages(currentChat));
if (allowRepeat && NekoConfig.showRepeat) {
items.add(LocaleController.getString("Repeat", R.string.Repeat));
options.add(94);
Expand All @@ -14841,7 +14841,7 @@ private void createMenu(View v, boolean single, boolean listView, float x, float
}
if (!inScheduleMode) {
boolean allowPrpr = currentUser != null
|| (currentChat != null && ChatObject.canSendMessages(currentChat) && !currentChat.broadcast &&
|| (currentChat != null && !ChatObject.isNotInChat(currentChat) && ChatObject.canSendMessages(currentChat) && !currentChat.broadcast &&
message.isFromUser());
boolean allowViewHistory = currentUser == null
&& (currentChat != null && !currentChat.broadcast && message.isFromUser());
Expand Down Expand Up @@ -15310,7 +15310,7 @@ private void startEditingMessageObject(MessageObject messageObject) {
updatePinnedMessageView(true);
updateVisibleRows();

if (!messageObject.scheduled && !UserConfig.getInstance(currentAccount).isBot) {
if (!messageObject.scheduled && !getUserConfig().isBot) {
TLRPC.TL_messages_getMessageEditData req = new TLRPC.TL_messages_getMessageEditData();
req.peer = getMessagesController().getInputPeer((int) dialog_id);
req.id = messageObject.getId();
Expand Down Expand Up @@ -15972,14 +15972,14 @@ public void onUnsupported() {
presentFragment(new MessageDetailsActivity(selectedObject));
break;
} case 90: {
TLRPC.User user = MessagesController.getInstance(currentAccount).getUser(selectedObject.messageOwner.from_id);
TLRPC.User user = getMessagesController().getUser(selectedObject.messageOwner.from_id);
getMediaDataController().searchMessagesInChat("", dialog_id, mergeDialogId, classGuid, 0, user);
showMessagesSearchListView(true);
break;
} case 92: {
TLRPC.User user = MessagesController.getInstance(currentAccount).getUser(selectedObject.messageOwner.from_id);
TLRPC.User user = getMessagesController().getUser(selectedObject.messageOwner.from_id);
if (user.username != null) {
SendMessagesHelper.getInstance(currentAccount).sendMessage("/prpr@" + user.username, dialog_id, selectedObject, null, false,
getSendMessagesHelper().sendMessage("/prpr@" + user.username, dialog_id, selectedObject, null, false,
null, null, null, true, 0);
} else {
SpannableString spannableString = new SpannableString("/prpr@" + user.first_name);
Expand All @@ -15995,7 +15995,7 @@ public void onUnsupported() {
}
}
ArrayList<TLRPC.MessageEntity> entities = getMediaDataController().getEntities(cs, supportsSendingNewEntities);
SendMessagesHelper.getInstance(currentAccount).sendMessage(spannableString.toString(), dialog_id, selectedObject, null, false,
getSendMessagesHelper().sendMessage(spannableString.toString(), dialog_id, selectedObject, null, false,
entities, null, null, true, 0);
}
break;
Expand Down Expand Up @@ -16044,7 +16044,7 @@ public void onUnsupported() {
} case 93: {
ArrayList<MessageObject> messages = new ArrayList<>();
messages.add(selectedObject);
forwardMessages(messages, false, true, 0, UserConfig.getInstance(currentAccount).getClientUserId());
forwardMessages(messages, false, true, 0, getUserConfig().getClientUserId());
break;
} case 94: {
ArrayList<MessageObject> messages = new ArrayList<>();
Expand Down Expand Up @@ -16143,7 +16143,7 @@ private boolean processSelectedOptionLongClick(int option) {
toSend.append(c);
}
}
SendMessagesHelper.getInstance(currentAccount).sendMessage(toSend.toString(), dialog_id, selectedObject, null, false,
getSendMessagesHelper().sendMessage(toSend.toString(), dialog_id, selectedObject, null, false,
null, null, null, true, 0);
return true;
}
Expand Down Expand Up @@ -17666,7 +17666,7 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
} else if (position >= messagesStartRow && position < messagesEndRow) {
MessageObject message = messages.get(position - messagesStartRow);
View view = holder.itemView;
boolean fromUserBlocked = MessagesController.getInstance(currentAccount).blockedUsers.indexOfKey(message.getFromId()) >= 0 && NekoConfig.ignoreBlocked;
boolean fromUserBlocked = getMessagesController().blockedUsers.indexOfKey(message.getFromId()) >= 0 && NekoConfig.ignoreBlocked;

if (view instanceof ChatMessageCell) {
final ChatMessageCell messageCell = (ChatMessageCell) view;
Expand Down Expand Up @@ -18875,7 +18875,7 @@ private void doAdminActions(int option){
continue;
}
final TLRPC.ChannelParticipant channelParticipant;
TLRPC.User user = MessagesController.getInstance(currentAccount).getUser(participant.user_id);
TLRPC.User user = getMessagesController().getUser(participant.user_id);
if (ChatObject.isChannel(currentChat)) {
channelParticipant = ((TLRPC.TL_chatChannelParticipant) participant).channelParticipant;
} else {
Expand Down

0 comments on commit 69c2c45

Please sign in to comment.