diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java index 9624aa2a4b..82d867c47f 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java @@ -5757,7 +5757,7 @@ private void setMessageContent(MessageObject messageObject, MessageObject.Groupe drawSideButton = checkNeedDrawShareButton(messageObject) ? 2 : 0; } else if (messageObject.searchType == ChatActivity.SEARCH_MY_MESSAGES) { drawSideButton = 0; - } else if (!Config.ignoreChatStrict && MessagesController.getInstance(currentAccount).isChatNoForwards(messageObject.getChatId()) || (messageObject.messageOwner != null && messageObject.messageOwner.noforwards)) { + } else if (!Config.ignoreChatStrict && (MessagesController.getInstance(currentAccount).isChatNoForwards(messageObject.getChatId()) || (messageObject.messageOwner != null && messageObject.messageOwner.noforwards))) { drawSideButton = 0; } else { drawSideButton = !isRepliesChat && checkNeedDrawShareButton(messageObject) ? 1 : 0; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java index 5e752eeae4..aa525a839b 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java @@ -18303,7 +18303,7 @@ private void addToSelectedMessages(MessageObject messageObject, boolean outside, ActionBarMenuItem shareItem = actionBar.createActionMode().getItem(share); createBottomMessagesActionButtons(); - boolean noforwards = !Config.ignoreChatStrict && getMessagesController().isChatNoForwards(currentChat) || hasSelectedNoforwardsMessage(); + boolean noforwards = !Config.ignoreChatStrict && (getMessagesController().isChatNoForwards(currentChat) || hasSelectedNoforwardsMessage()); if (prevCantForwardCount == 0 && cantForwardMessagesCount != 0 || prevCantForwardCount != 0 && cantForwardMessagesCount == 0) { forwardButtonAnimation = new AnimatorSet(); ArrayList animators = new ArrayList<>(); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java index 4a786c8976..3457f51f93 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java @@ -3237,7 +3237,7 @@ private void updateForwardItem() { if (forwardItem == null) { return; } - boolean noforwards = !Config.ignoreChatStrict && profileActivity.getMessagesController().isChatNoForwards(-dialog_id) || hasNoforwardsMessage(); + boolean noforwards = !Config.ignoreChatStrict && (profileActivity.getMessagesController().isChatNoForwards(-dialog_id) || hasNoforwardsMessage()); forwardItem.setAlpha(noforwards ? 0.5f : 1f); if (forwardNoQuoteItem != null) forwardNoQuoteItem.setAlpha(noforwards ? 0.5f : 1f); if (noforwards && forwardItem.getBackground() != null) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java b/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java index bbd1a83771..86038ac770 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java @@ -13208,7 +13208,7 @@ private void setIsAboutToSwitchToIndex(int index, boolean init, boolean animated actionBarContainer.setSubtitle(subtitle, animated); boolean isInvoice = newMessageObject.isInvoice(); - boolean noforwards = !Config.ignoreChatStrict && MessagesController.getInstance(currentAccount).isChatNoForwards(newMessageObject.getChatId()) || (newMessageObject.messageOwner != null && newMessageObject.messageOwner.noforwards) || newMessageObject.hasRevealedExtendedMedia(); + boolean noforwards = !Config.ignoreChatStrict && (MessagesController.getInstance(currentAccount).isChatNoForwards(newMessageObject.getChatId()) || (newMessageObject.messageOwner != null && newMessageObject.messageOwner.noforwards) || newMessageObject.hasRevealedExtendedMedia()); if (isVideo) { bottomLayout.setVisibility(View.VISIBLE); bottomLayout.setTag(1);