From 917dd3c39cb2d24930eb063c64adf0d0782432ca Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 21 Oct 2016 00:49:26 +0200 Subject: [PATCH] Show messages left/right. --- .../org/telegram/messenger/MessageObject.java | 16 ++++++++++------ .../java/org/telegram/messenger/MrMailbox.java | 7 ++++++- .../telegram/messenger/query/MessagesQuery.java | 6 +++--- .../src/main/java/org/telegram/tgnet/TLRPC.java | 4 +++- .../org/telegram/ui/Cells/ChatMessageCell.java | 3 ++- .../main/java/org/telegram/ui/ChatActivity.java | 6 +++--- 6 files changed, 27 insertions(+), 15 deletions(-) diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java b/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java index 3f77fec4e..ae3013ac3 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java @@ -60,14 +60,14 @@ public class MessageObject { public ArrayList photoThumbs; public VideoEditedInfo videoEditedInfo; public boolean viewsReloaded; - public int wantedBotKeyboardWidth; + //public int wantedBotKeyboardWidth; public boolean attachPathExists; public boolean mediaExists; public boolean forceUpdate; private static TextPaint textPaint; - private static TextPaint botButtonPaint; + //private static TextPaint botButtonPaint; public int lastLineWidth; public int textWidth; public int textHeight; @@ -313,7 +313,7 @@ public class MessageObject { } else if (message.action instanceof TLRPC.TL_messageActionChannelMigrateFrom) { messageText = LocaleController.getString("ActionMigrateFromGroup", R.string.ActionMigrateFromGroup); } else if (message.action instanceof TLRPC.TL_messageActionPinMessage) { - generatePinMessageText(fromUser, fromUser == null ? chats.get(message.to_id.channel_id) : null); + //generatePinMessageText(fromUser, fromUser == null ? chats.get(message.to_id.channel_id) : null); } else if (message.action instanceof TLRPC.TL_messageActionHistoryClear) { messageText = LocaleController.getString("HistoryCleared", R.string.HistoryCleared); } @@ -360,7 +360,7 @@ public class MessageObject { } setType(); - measureInlineBotButtons(); + //measureInlineBotButtons(); Calendar rightNow = new GregorianCalendar(); rightNow.setTimeInMillis((long) (messageOwner.date) * 1000); @@ -397,6 +397,7 @@ public class MessageObject { return textPaint; } + /* public void generatePinMessageText(TLRPC.User fromUser, TLRPC.Chat chat) { if (fromUser == null && chat == null) { if (messageOwner.from_id > 0) { @@ -439,7 +440,9 @@ public class MessageObject { } } } + */ + /* private void measureInlineBotButtons() { wantedBotKeyboardWidth = 0; if (!(messageOwner.reply_markup instanceof TLRPC.TL_replyInlineMarkup)) { @@ -464,6 +467,7 @@ public class MessageObject { wantedBotKeyboardWidth = Math.max(wantedBotKeyboardWidth, (maxButtonSize + AndroidUtilities.dp(12)) * size + AndroidUtilities.dp(5) * (size - 1)); } } + */ public void setType() { int oldType = type; @@ -1141,11 +1145,11 @@ public class MessageObject { return messageOwner.out; } - public boolean isOutOwner() { + public boolean isOutOwner() { // is the message an outgoing message? return messageOwner.out && messageOwner.from_id > 0 && !messageOwner.post; } - public boolean isFromUser() { + public boolean isFromUser() { // is the message from any user? send or received? return messageOwner.from_id > 0 && !messageOwner.post; } diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java b/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java index d585bfb1b..0c84e98f8 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java @@ -63,14 +63,19 @@ public class MrMailbox { // TLRPC.TL_messageService is used to display messages as "You joined the group" // TLRPC.TL_message is a normal message (also photos?) + int state = MrMsgGetState(hMsg); + ret.from_id = MrMailbox.MrMsgGetFromId(hMsg); ret.to_id = new TLRPC.TL_peerUser(); ret.to_id.user_id = MrMailbox.MrMsgGetToId(hMsg); ret.message = MrMailbox.MrMsgGetText(hMsg); ret.date = (int)MrMsgGetTimestamp(hMsg); ret.dialog_id = MrMsgGetChatId(hMsg); - ret.unread = false; + ret.unread = state==MR_IN_UNREAD; + ret.media_unread = ret.unread; ret.flags = 0; + ret.post = false; // ? true=avatar wird in gruppen nicht angezeigt + ret.out = ret.from_id==1; // true=outgoing message, read eg. in MessageObject.isOutOwner() // MessageObject.contentType - ?? return ret; diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/query/MessagesQuery.java b/TMessagesProj/src/main/java/org/telegram/messenger/query/MessagesQuery.java index 6f0a230c7..65ce6704c 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/query/MessagesQuery.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/query/MessagesQuery.java @@ -426,9 +426,9 @@ public class MessagesQuery { for (int b = 0; b < arrayList.size(); b++) { MessageObject m = arrayList.get(b); m.replyMessageObject = messageObject; - if (m.messageOwner.action instanceof TLRPC.TL_messageActionPinMessage) { - m.generatePinMessageText(null, null); - } + //if (m.messageOwner.action instanceof TLRPC.TL_messageActionPinMessage) { + // m.generatePinMessageText(null, null); + //} } changed = true; } diff --git a/TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java b/TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java index 74178e448..5eb6b5026 100644 --- a/TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java +++ b/TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java @@ -3717,7 +3717,7 @@ public class TLRPC { ReplyMarkup result = null; switch(constructor) { case 0x48a30254: - result = new TL_replyInlineMarkup(); + //result = new TL_replyInlineMarkup(); break; case 0xa03e5b85: result = new TL_replyKeyboardHide(); @@ -3739,6 +3739,7 @@ public class TLRPC { } } + /* public static class TL_replyInlineMarkup extends ReplyMarkup { public static int constructor = 0x48a30254; @@ -3771,6 +3772,7 @@ public class TLRPC { } } } + */ public static class TL_replyKeyboardHide extends ReplyMarkup { public static int constructor = 0xa03e5b85; 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 3417c3c9c..acbf70c57 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java @@ -2723,6 +2723,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate botButtonsByData.clear(); } + /* 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); @@ -2772,7 +2773,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate } } widthForButtons = maxButtonsWidth; - } else { + } else */ { substractBackgroundHeight = 0; keyboardHeight = 0; } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java index 4145b58af..1fd57d600 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java @@ -5147,9 +5147,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not } } else if (messageObject.messageOwner.reply_to_msg_id != 0 && messageObject.replyMessageObject == null) { messageObject.replyMessageObject = messagesDict[0].get(messageObject.messageOwner.reply_to_msg_id); - if (messageObject.messageOwner.action instanceof TLRPC.TL_messageActionPinMessage) { - messageObject.generatePinMessageText(null, null); - } + //if (messageObject.messageOwner.action instanceof TLRPC.TL_messageActionPinMessage) { + // messageObject.generatePinMessageText(null, null); + //} } } else if (inlineReturn != 0) { if (messageObject.messageOwner.reply_markup != null) {