awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Cleanup MessageObject.

Browse Source
This commit is contained in:
B. Petersen
2017-02-17 16:33:48 +01:00
parent a34d511922
commit 502bae625f
7 changed files with 30 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java
+18 -92
View File
@@ -35,10 +35,7 @@ import com.b44t.ui.ActionBar.Theme;
import com.b44t.ui.Components.URLSpanNoUnderline;
import java.io.File;
import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -53,10 +50,11 @@ public class MessageObject {
public TLRPC.Message messageOwner;
public CharSequence messageText;
public CharSequence caption;
public MessageObject replyMessageObject;
public int type = 1000; // 13: sticker
public final MessageObject replyMessageObject = null;
public int type = 1000; // 8: gif, 13: sticker
public int contentType; // one of ChatActivity.ROWTYPE_MESSAGE_CELL, .ROWTYPE_ACTION_CELL or .ROWTYPE_UNREAD_CELL
public String dateKey;
public float audioProgress;
public int audioProgressSec;
public ArrayList<TLRPC.PhotoSize> photoThumbs;
@@ -71,9 +69,7 @@ public class MessageObject {
public int textWidth;
public int textHeight;
private boolean layoutCreated;
public static Pattern urlPattern;
private static Pattern urlPattern;
public static class TextLayoutBlock {
public StaticLayout textLayout;
@@ -87,11 +83,7 @@ public class MessageObject {
public ArrayList<TextLayoutBlock> textLayoutBlocks;
public MessageObject(TLRPC.Message message, AbstractMap<Integer, TLRPC.User> users, boolean generateLayout) {
this(message, users, null, generateLayout);
}
public MessageObject(TLRPC.Message message, AbstractMap<Integer, TLRPC.User> users, AbstractMap<Integer, TLRPC.Chat> chats, boolean generateLayout) {
public MessageObject(TLRPC.Message message, boolean generateLayout) {
if (textPaint == null) {
textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
textPaint.setColor(Theme.MSG_TEXT_COLOR);
@@ -102,22 +94,12 @@ public class MessageObject {
messageOwner = message;
if (message.replyMessage != null) {
/*if (message.replyMessage != null) {
replyMessageObject = new MessageObject(message.replyMessage, users, chats, false);
}
TLRPC.User fromUser = null;
if (message.from_id > 0) {
if (users != null) {
fromUser = users.get(message.from_id);
}
if (fromUser == null) {
fromUser = MessagesController.getInstance().getUser(message.from_id);
}
}
}*/
if (!isMediaEmpty()) {
if (message.media instanceof TLRPC.TL_messageMediaPhoto) {
/*if (message.media instanceof TLRPC.TL_messageMediaPhoto) {
messageText = mContext.getString(R.string.AttachPhoto);
} else if (isVideo()) {
messageText = mContext.getString(R.string.AttachVideo);
@@ -148,7 +130,8 @@ public class MessageObject {
messageText = mContext.getString(R.string.AttachDocument);
}
}
}
}*/
messageText = "<media message>"; // should not be displayed, use MrMsg.getSummarytext() instead
} else {
messageText = message.message;
}
@@ -157,14 +140,6 @@ public class MessageObject {
}
setType();
//measureInlineBotButtons();
Calendar rightNow = new GregorianCalendar();
rightNow.setTimeInMillis((long) (messageOwner.date) * 1000);
int dateDay = rightNow.get(Calendar.DAY_OF_YEAR);
int dateYear = rightNow.get(Calendar.YEAR);
int dateMonth = rightNow.get(Calendar.MONTH);
dateKey = String.format("%d_%02d_%02d", dateYear, dateMonth, dateDay);
if (messageOwner.message != null && messageOwner.id < 0 && messageOwner.message.length() > 6 && isVideo()) {
videoEditedInfo = new VideoEditedInfo();
@@ -176,9 +151,8 @@ public class MessageObject {
generateCaption();
if (generateLayout) {
messageText = Emoji.replaceEmoji(messageText, textPaint.getFontMetricsInt(), AndroidUtilities.dp(20), false);
generateLayout(fromUser);
generateLayout();
}
layoutCreated = generateLayout;
generateThumbs(false);
checkMediaExistance();
}
@@ -193,7 +167,7 @@ public class MessageObject {
return textPaint;
}
public void setType() {
private void setType() {
int oldType = type;
if (messageOwner instanceof TLRPC.TL_message /*|| messageOwner instanceof TLRPC.TL_messageForwarded_old2*/) {
if (isMediaEmpty()) {
@@ -255,18 +229,6 @@ public class MessageObject {
}
}
public void checkLayout() {
if (!layoutCreated) {
layoutCreated = true;
TLRPC.User fromUser = null;
if (isFromUser()) {
fromUser = MessagesController.getInstance().getUser(messageOwner.from_id);
}
messageText = Emoji.replaceEmoji(messageText, textPaint.getFontMetricsInt(), AndroidUtilities.dp(20), false);
generateLayout(fromUser);
}
}
public static boolean isGifDocument(TLRPC.Document document) {
return document != null && document.thumb != null && document.mime_type != null && (document.mime_type.equals("image/gif") || isNewGifDocument(document));
}
@@ -282,7 +244,7 @@ public class MessageObject {
return false;
}
public void generateThumbs(boolean update) {
private void generateThumbs(boolean update) {
/*if (messageOwner instanceof TLRPC.TL_messageService) {
if (messageOwner.action instanceof TLRPC.TL_messageActionChatEditPhoto) {
if (!update) {
@@ -528,24 +490,7 @@ public class MessageObject {
return false;
}
public void generateLinkDescription() {
/*if (linkDescription != null) {
return;
}
if (messageOwner.media instanceof TLRPC.TL_messageMediaWebPage && messageOwner.media.webpage instanceof TLRPC.TL_webPage && messageOwner.media.webpage.description != null) {
linkDescription = Spannable.Factory.getInstance().newSpannable(messageOwner.media.webpage.description);
if (containsUrls(linkDescription)) {
try {
Linkify.addLinks((Spannable) linkDescription, Linkify.WEB_URLS);
} catch (Exception e) {
FileLog.e("messenger", e);
}
}
linkDescription = Emoji.replaceEmoji(linkDescription, textPaint.getFontMetricsInt(), AndroidUtilities.dp(20), false);
}*/
}
public void generateCaption() {
private void generateCaption() {
if (caption != null) {
return;
}
@@ -589,7 +534,7 @@ public class MessageObject {
}
}
public static void addLinks(CharSequence messageText) {
private static void addLinks(CharSequence messageText) {
if (messageText instanceof Spannable && containsUrls(messageText)) {
if (messageText.length() < 200) {
try {
@@ -608,12 +553,11 @@ public class MessageObject {
}
}
private void generateLayout(TLRPC.User fromUser) {
private void generateLayout() {
if (type != 0 || messageOwner.to_id == null || messageText == null || messageText.length() == 0) {
return;
}
generateLinkDescription();
textLayoutBlocks = new ArrayList<>();
/*final boolean useManualParse = true; // false only add links to phone numbers; was used in Telegram for incoming messages that were already parsed (?)
@@ -1132,29 +1076,12 @@ public class MessageObject {
} else if (h < AndroidUtilities.dp(120)) {
h = AndroidUtilities.dp(120);
}
/*if (isSecretPhoto()) {
if (AndroidUtilities.isTablet()) {
h = (int) (AndroidUtilities.getMinTabletSide() * 0.5f);
} else {
h = (int) (Math.min(AndroidUtilities.displaySize.x, AndroidUtilities.displaySize.y) * 0.5f);
}
}*/
photoHeight = h;
}
return photoHeight + AndroidUtilities.dp(14);
}
}
public String getStickerEmoji() {
for (int a = 0; a < messageOwner.media.document.attributes.size(); a++) {
TLRPC.DocumentAttribute attribute = messageOwner.media.document.attributes.get(a);
if (attribute instanceof TLRPC.TL_documentAttributeSticker) {
return attribute.alt != null && attribute.alt.length() > 0 ? attribute.alt : null;
}
}
return null;
}
public boolean isSticker() {
if (type != 1000) {
return type == 13;
@@ -1272,7 +1199,7 @@ public class MessageObject {
}
public boolean isReply() {
return (messageOwner.reply_to_msg_id != 0 || messageOwner.reply_to_random_id != 0) && (messageOwner.flags & TLRPC.MESSAGE_FLAG_REPLY) != 0;
return false;
}
public boolean isMediaEmpty() {
@@ -1291,7 +1218,6 @@ public class MessageObject {
}
public void checkMediaExistance() {
File cacheFile = null;
attachPathExists = false;
mediaExists = false;
if (type == 1) {
MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java
+1 -1
View File
@@ -408,7 +408,7 @@ public class NotificationsController {
return;
}
TLRPC.Message tmsg = mrMsg.get_TLRPC_Message();
MessageObject msgDrawObj = new MessageObject(tmsg, null, true);
MessageObject msgDrawObj = new MessageObject(tmsg, true);
delayedPushMessages.add(msgDrawObj);
pushMessages.add(0, msgDrawObj);
MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java
+7 -9
View File
@@ -562,19 +562,19 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter
}
public void sendMessageContact(TLRPC.User user, long peer, MessageObject reply_to_msg, HashMap<String, String> params) {
sendMessage__(null, null, null, null, user, null, peer, null, reply_to_msg, params);
sendMessage__(null, null, null, null, user, null, peer, null, params);
}
public void sendMessageDocument(TLRPC.TL_document document, VideoEditedInfo videoEditedInfo, String path, long peer, MessageObject reply_to_msg, HashMap<String, String> params) {
sendMessage__(null, null, null, videoEditedInfo, null, document, peer, path, reply_to_msg, params);
sendMessage__(null, null, null, videoEditedInfo, null, document, peer, path, params);
}
public void sendMessageText(String message, long peer, MessageObject reply_to_msg, HashMap<String, String> params) {
sendMessage__(message, null, null, null, null, null, peer, null, reply_to_msg, params);
sendMessage__(message, null, null, null, null, null, peer, null, params);
}
public void sendMessagePhoto(TLRPC.TL_photo photo, String path, long peer, MessageObject reply_to_msg, HashMap<String, String> params) {
sendMessage__(null, null, photo, null, null, null, peer, path, reply_to_msg, params);
sendMessage__(null, null, photo, null, null, null, peer, path, params);
}
private void sendMessage__(String message,
@@ -585,7 +585,6 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter
TLRPC.TL_document document,
long peer,
String path,
MessageObject reply_to_msg,
HashMap<String, String> params) {
if (peer == 0) { // peer == dialog id
return;
@@ -717,10 +716,10 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter
newMsg.flags |= TLRPC.MESSAGE_FLAG_HAS_MEDIA;
newMsg.unread = true;
newMsg.dialog_id = peer;
if (reply_to_msg != null) {
/*if (reply_to_msg != null) {
newMsg.flags |= TLRPC.MESSAGE_FLAG_REPLY;
newMsg.reply_to_msg_id = reply_to_msg.getId();
}
}*/
if (lower_id != 0) {
{
@@ -741,8 +740,7 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter
newMsg.media_unread = true;
newMsg.send_state = MessageObject.MESSAGE_SEND_STATE_SENDING;
newMsgObj = new MessageObject(newMsg, null, true);
newMsgObj.replyMessageObject = reply_to_msg;
newMsgObj = new MessageObject(newMsg, true);
if (!newMsgObj.isForwarded() && newMsgObj.type == 3) {
newMsgObj.attachPathExists = true;
}
MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java
-1
View File
@@ -465,7 +465,6 @@ public class TLRPC {
public long random_id; //custom
public long dialog_id; //custom
public int layer; //custom
public TLRPC.Message replyMessage; //custom
public boolean created_by_mr;
}
MessengerProj/src/main/java/com/b44t/ui/AudioSelectActivity.java
+1 -1
View File
@@ -261,7 +261,7 @@ public class AudioSelectActivity extends BaseFragment implements NotificationCen
fileName.file_name = file.getName();
message.media.document.attributes.add(fileName);
audioEntry.messageObject = new MessageObject(message, null, false);
audioEntry.messageObject = new MessageObject(message, false);
newAudioEntries.add(audioEntry);
id--;
MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java
+2 -2
View File
@@ -3074,7 +3074,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
// show a normal message
MrMsg mrMsg = MrMailbox.getMsg(msg_id);
TLRPC.Message msg = mrMsg.get_TLRPC_Message();
MessageObject msgDrawObj = new MessageObject(msg, null, true);
MessageObject msgDrawObj = new MessageObject(msg, true);
ChatMessageCell messageCell = (ChatMessageCell) view;
messageCell.isChat = m_mrChat.getType()==MrChat.MR_CHAT_GROUP;
@@ -3102,7 +3102,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
dateMsg.id = 0;
dateMsg.date = (int)mrMsg.getTimestamp();
dateMsg.message = LocaleController.formatDateChat(dateMsg.date);
MessageObject msgDrawObj = new MessageObject(dateMsg, null, false);
MessageObject msgDrawObj = new MessageObject(dateMsg, false);
msgDrawObj.type = 10;
msgDrawObj.contentType = ROWTYPE_DATE_HEADLINE;
MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java
+1 -1
View File
@@ -2095,7 +2095,7 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
message.media = new TLRPC.TL_messageMediaDocument();
message.media.document = audioToSend;
message.flags |= TLRPC.MESSAGE_FLAG_HAS_MEDIA | TLRPC.MESSAGE_FLAG_HAS_FROM_ID;
audioToSendMessageObject = new MessageObject(message, null, false);
audioToSendMessageObject = new MessageObject(message, false);
recordedAudioPanel.setAlpha(1.0f);
recordedAudioPanel.setVisibility(VISIBLE);