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 a12eee3a3..a882827ea 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java
@@ -2648,57 +2648,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
}
}
- /* EDIT BY MR
- if (messageObject.messageOwner.reply_markup instanceof TLRPC.TL_replyInlineMarkup) {
- int rows = messageObject.messageOwner.reply_markup.rows.size();
- substractBackgroundHeight = keyboardHeight = dp(44 + 4) * rows + dp(1);
-
- widthForButtons = backgroundWidth;
- boolean fullWidth = false;
- if (messageObject.wantedBotKeyboardWidth > widthForButtons) {
- int maxButtonWidth = -dp(isChat && messageObject.isFromUser() && !messageObject.isOutOwner() ? 62 : 10);
- if (isTablet()) {
- maxButtonWidth += getMinTabletSide();
- } else {
- maxButtonWidth += Math.min(displaySize.x, displaySize.y);
- }
- widthForButtons = Math.max(backgroundWidth, Math.min(messageObject.wantedBotKeyboardWidth, maxButtonWidth));
- fullWidth = true;
- }
-
- int maxButtonsWidth = 0;
- for (int a = 0; a < rows; a++) {
- TLRPC.TL_keyboardButtonRow row = messageObject.messageOwner.reply_markup.rows.get(a);
- int buttonsCount = row.buttons.size();
- int buttonWidth = (widthForButtons - (dp(5) * (buttonsCount - 1)) - dp(!fullWidth && mediaBackground ? 0 : 9) - dp(2)) / buttonsCount;
- for (int b = 0; b < row.buttons.size(); b++) {
- BotButton botButton = new BotButton();
- botButton.button = row.buttons.get(b);
- String key = Utilities.bytesToHex(botButton.button.data);
- BotButton oldButton = botButtonsByData.get(key);
- if (oldButton != null) {
- botButton.progressAlpha = oldButton.progressAlpha;
- botButton.angle = oldButton.angle;
- botButton.lastUpdateTime = oldButton.lastUpdateTime;
- } else {
- botButton.lastUpdateTime = System.currentTimeMillis();
- }
- botButtonsByData.put(key, botButton);
- botButton.x = b * (buttonWidth + dp(5));
- botButton.y = a * dp(44 + 4) + dp(5);
- botButton.width = buttonWidth;
- botButton.height = dp(44);
- CharSequence buttonText = Emoji.replaceEmoji(botButton.button.text, botButtonPaint.getFontMetricsInt(), dp(15), false);
- buttonText = TextUtils.ellipsize(buttonText, botButtonPaint, buttonWidth - dp(10), TextUtils.TruncateAt.END);
- botButton.title = new StaticLayout(buttonText, botButtonPaint, buttonWidth - dp(10), Layout.Alignment.ALIGN_CENTER, 1.0f, 0.0f, false);
- botButtons.add(botButton);
- if (b == row.buttons.size() - 1) {
- maxButtonsWidth = Math.max(maxButtonsWidth, botButton.x + botButton.width);
- }
- }
- }
- widthForButtons = maxButtonsWidth;
- } else */ {
+ {
substractBackgroundHeight = 0;
keyboardHeight = 0;
}
@@ -3838,21 +3788,6 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
String viaUsername = null;
CharSequence viaString = null;
- /*EDIT BY MR
- if (messageObject.messageOwner.via_bot_id != 0) {
- TLRPC.User botUser = MessagesController.getInstance().getUser(messageObject.messageOwner.via_bot_id);
- if (botUser != null && botUser.username != null && botUser.username.length() > 0) {
- viaUsername = "@" + botUser.username;
- viaString = replaceTags(String.format(" via %s", viaUsername));
- viaWidth = (int) Math.ceil(replyNamePaint.measureText(viaString, 0, viaString.length()));
- currentViaBotUser = botUser;
- }
- } else if (messageObject.messageOwner.via_bot_name != null && messageObject.messageOwner.via_bot_name.length() > 0) {
- viaUsername = "@" + messageObject.messageOwner.via_bot_name;
- viaString = replaceTags(String.format(" via %s", viaUsername));
- viaWidth = (int) Math.ceil(replyNamePaint.measureText(viaString, 0, viaString.length()));
- }
- */
boolean authorName = drawName && isChat && !currentMessageObject.isOutOwner();
boolean viaBot = (messageObject.messageOwner.fwd_from == null || messageObject.type == 14) && viaUsername != null;
@@ -3865,9 +3800,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
if (authorName) {
if (currentUser != null) {
- // EDIT BY MR
currentNameString = cname;
- // /EDIT BY MR
} else if (currentChat != null) {
currentNameString = currentChat.title;
} else {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
index f4419395d..1de56647a 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
@@ -6889,13 +6889,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
public void onClick(DialogInterface dialogInterface, int i) {
ArrayList ids = null;
for (int a = 1; a >= 0; a--) {
-
for (HashMap.Entry entry : selectedMessagesIds[a].entrySet()) {
MessageObject msg = entry.getValue();
int id_to_del = msg.messageOwner.id;
MrMailbox.MrMailboxDeleteMsgById(MrMailbox.hMailbox, id_to_del);
}
-
}
actionBar.hideActionMode();
@@ -6904,30 +6902,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
MrMailbox.reloadMainChatlist();
NotificationCenter.getInstance().postNotificationName(NotificationCenter.dialogsNeedReload);
-
-
- /*
- if (userFinal != null) {
- if (checks[0]) {
- MessagesController.getInstance().deleteUserFromChat(currentChat.id, userFinal, info);
- }
- if (checks[1]) {
- TLRPC.TL_channels_reportSpam req = new TLRPC.TL_channels_reportSpam();
- req.channel = MessagesController.getInputChannel(currentChat);
- req.user_id = MessagesController.getInputUser(userFinal);
- req.id = ids;
- ConnectionsManager.getInstance().sendRequest(req, new RequestDelegate() {
- @Override
- public void run(TLObject response, TLRPC.TL_error error) {
-
- }
- });
- }
- if (checks[2]) {
- MessagesController.getInstance().deleteUserChannelHistory(currentChat, userFinal, 0);
- }
- }
- */
}
});
builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null);