From e40cae149b534b2d25d86d63704b505c1ecb3399 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Thu, 9 Mar 2017 21:33:49 +0100 Subject: [PATCH] Mark some members as being final or remove them. --- .../b44t/messenger/MessagesController.java | 4 -- .../main/java/com/b44t/messenger/MrMsg.java | 1 - .../messenger/NotificationsController.java | 6 +-- .../main/java/com/b44t/messenger/TLRPC.java | 43 ++++++------------- .../java/com/b44t/messenger/UserObject.java | 4 -- .../com/b44t/ui/Cells/ChatMessageCell.java | 21 ++++----- .../java/com/b44t/ui/Cells/DialogCell.java | 12 +++--- .../main/java/com/b44t/ui/ChatActivity.java | 19 -------- 8 files changed, 32 insertions(+), 78 deletions(-) diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MessagesController.java b/MessengerProj/src/main/java/com/b44t/messenger/MessagesController.java index 5774a7b4c..4de584b3a 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MessagesController.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MessagesController.java @@ -73,10 +73,6 @@ public class MessagesController { return u; } - public TLRPC.Chat getChat(Integer id) { - return null; - } - public MediaController.SearchImage saveGif(TLRPC.Document document) { MediaController.SearchImage searchImage = new MediaController.SearchImage(); searchImage.type = 2; diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MrMsg.java b/MessengerProj/src/main/java/com/b44t/messenger/MrMsg.java index 3825bad24..d35524840 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MrMsg.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MrMsg.java @@ -148,7 +148,6 @@ public class MrMsg { ret.unread = state!=MR_OUT_READ; // the state of outgoing messages ret.media_unread = ret.unread; ret.flags = 0; // posible flags: MESSAGE_FLAG_HAS_FROM_ID, however, this seems to be read only - ret.post = false; // ? true=avatar wird in gruppen nicht angezeigt, wird aber in isFromUser() auch überprüft... ret.out = ret.from_id==MrContact.MR_CONTACT_ID_SELF; // true=outgoing message, read eg. in MessageObject.isOutOwner() ret.created_by_mr = true; diff --git a/MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java b/MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java index 4209e4ce6..76a8627a3 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java @@ -1326,10 +1326,10 @@ public class NotificationsController { continue; } } else { - chat = MessagesController.getInstance().getChat(-(int)dialog_id); - if (chat == null) { + /*chat = MessagesController.getInstance().getChat(-(int)dialog_id); + if (chat == null) {*/ continue; - } + //} } TLRPC.FileLocation photoPath = null; if (AndroidUtilities.needShowPasscode(false) || UserConfig.isWaitingForPasscodeEnter) { diff --git a/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java b/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java index e8e7c02fd..8a75b6382 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java @@ -76,7 +76,6 @@ public class TLRPC { } public static class Peer extends TLObject { - public final int channel_id = 0; public int user_id; public final int chat_id = 0; } @@ -104,16 +103,8 @@ public class TLRPC { public int duration; public String mime_type; public int size; - public int dc_id; + public final int dc_id = 0; public int user_id; - public byte[] key; - public byte[] iv; - } - - public static class ChatFull extends TLObject { - public int flags; - public int id; - public String about; } public static class InputFileLocation extends TLObject { @@ -121,7 +112,6 @@ public class TLRPC { public long access_hash; public long volume_id; public int local_id; - public long secret; } public static class TL_inputDocumentFileLocation extends InputFileLocation { @@ -137,9 +127,6 @@ public class TLRPC { public String username; public UserProfilePhoto photo; public int flags; - public boolean self; - public boolean contact; - public boolean min; } public static class Video extends TLObject { @@ -154,8 +141,6 @@ public class TLRPC { public int h; public String mime_type; public String caption; - public byte[] key; - public byte[] iv; } public static class Document extends TLObject { @@ -212,12 +197,12 @@ public class TLRPC { public String title; public final ChatPhoto photo = null; public int date; - public int version; - public boolean editor; + public final int version = 0; + public final boolean editor = false; public String username; - public boolean signatures; - public boolean min; - public String address; + public final boolean signatures = false; + public final boolean min = false; + public final String address = null; } public static class StickerSet extends TLObject { @@ -305,22 +290,22 @@ public class TLRPC { public int from_id; public Peer to_id; public int date; - public int reply_to_msg_id; + public final int reply_to_msg_id = 0; public String message; public MessageMedia media; public int flags; public boolean media_unread; public boolean out; public boolean unread; - public int views; - public boolean silent; - public boolean post; + public final int views = 0; + public final boolean silent = false; + public final boolean post = false;// ? true=avatar wird in gruppen nicht angezeigt, wird aber in isFromUser() auch überprüft... public TL_messageFwdHeader fwd_from; public int send_state = 0; //custom public String attachPath = ""; //custom public HashMap params; //custom public long dialog_id; //custom - public int layer; //custom + public final int layer = 0; //custom public boolean created_by_mr; } @@ -330,9 +315,9 @@ public class TLRPC { public static class TL_dialog extends TLObject { final public int flags = 0; public Peer peer; - public int top_message; - public int unread_count; - public int pts; + public final int top_message = 0; + public final int unread_count = 0; + public final int pts = 0; public DraftMessage draft; public long id; //custom } diff --git a/MessengerProj/src/main/java/com/b44t/messenger/UserObject.java b/MessengerProj/src/main/java/com/b44t/messenger/UserObject.java index aff3de672..ad51f077e 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/UserObject.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/UserObject.java @@ -25,10 +25,6 @@ package com.b44t.messenger; public class UserObject { - public static boolean isUserSelf(TLRPC.User user) { - return user.self; - } - public static String getUserName(TLRPC.User user) { return "ErrName"; // use MrContact.getName() instead } diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java index 8f24af596..483a6e2a3 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java @@ -79,7 +79,6 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate public interface ChatMessageCellDelegate { void didPressedUserAvatar(ChatMessageCell cell, TLRPC.User user); - void didPressedChannelAvatar(ChatMessageCell cell, TLRPC.Chat chat, int postId); void didLongPressed(ChatMessageCell cell); void didPressedUrl(MessageObject messageObject, ClickableSpan url, boolean longPress); void didPressedImage(ChatMessageCell cell); @@ -244,7 +243,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate private boolean drawTime = true; private TLRPC.User currentUser; - private TLRPC.Chat currentChat; + private final Object currentChat = null; private TLRPC.FileLocation currentPhoto; private String currentNameString; @@ -693,8 +692,6 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate if (delegate != null) { if (currentUser != null) { delegate.didPressedUserAvatar(this, currentUser); - } else if (currentChat != null) { - delegate.didPressedChannelAvatar(this, currentChat, 0); } } } else if (event.getAction() == MotionEvent.ACTION_CANCEL) { @@ -895,12 +892,12 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate } TLRPC.User newUser = null; - TLRPC.Chat newChat = null; + final TLRPC.Chat newChat = null; if (currentMessageObject.isFromUser()) { newUser = MessagesController.getInstance().getUser(currentMessageObject.messageOwner.from_id); - } else if (currentMessageObject.messageOwner.post) { + } /*else if (currentMessageObject.messageOwner.post) { newChat = MessagesController.getInstance().getChat(currentMessageObject.messageOwner.to_id.channel_id); - } + }*/ TLRPC.FileLocation newPhoto = null; if (isAvatarVisible) { @@ -1231,7 +1228,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate wasLayout = false; drawNewchatButton = checkNeedDrawNewchatButton(messageObject); currentUser = null; - currentChat = null; + //currentChat = null; drawNameLayout = false; resetPressedLink(-1); @@ -2165,11 +2162,11 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate if (currentMessageObject.isFromUser()) { currentUser = MessagesController.getInstance().getUser(currentMessageObject.messageOwner.from_id); - } else if (currentMessageObject.messageOwner.from_id < 0) { + } /*else if (currentMessageObject.messageOwner.from_id < 0) { currentChat = MessagesController.getInstance().getChat(-currentMessageObject.messageOwner.from_id); } else if (currentMessageObject.messageOwner.post) { currentChat = MessagesController.getInstance().getChat(currentMessageObject.messageOwner.to_id.channel_id); - } + }*/ MrContact mrContact = null; String cname = ""; @@ -2198,9 +2195,9 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate if (authorName) { if (currentUser != null) { currentNameString = cname; - } else if (currentChat != null) { + } /*else if (currentChat != null) { currentNameString = currentChat.title; - } else { + } */ else { currentNameString = "DELETED"; } } else { diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/DialogCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/DialogCell.java index ca98cb087..1290e1842 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/DialogCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/DialogCell.java @@ -88,8 +88,8 @@ public class DialogCell extends BaseCell { private ImageReceiver avatarImage; private AvatarDrawable avatarDrawable; - private TLRPC.User user = null; - private TLRPC.Chat chat = null; + private final Object user = null; + private final Object chat = null; public boolean useSeparator = false; @@ -584,10 +584,10 @@ public class DialogCell extends BaseCell { } dialogMuted = isDialogCell && MessagesController.getInstance().isDialogMuted(currentDialogId); - user = null; - chat = null; + //user = null; + //chat = null; - int lower_id = (int)currentDialogId; + /*int lower_id = (int)currentDialogId; int high_id = (int)(currentDialogId >> 32); if (lower_id != 0) { if (high_id == 1) { @@ -599,7 +599,7 @@ public class DialogCell extends BaseCell { user = MessagesController.getInstance().getUser(lower_id); } } - } + }*/ ContactsController.setupAvatar(this, avatarImage, avatarDrawable, null, m_mrChat); diff --git a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java index 008c93865..429cbaefc 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java @@ -175,8 +175,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not private String currentPicturePath; - protected TLRPC.ChatFull info = null; - private String startVideoEdit = null; private final static int ID_COPY = 10; @@ -2609,23 +2607,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not return MediaController.getInstance().playAudio(messageObject); } - @Override - public void didPressedChannelAvatar(ChatMessageCell cell, TLRPC.Chat chat, int postId) { - if (actionBar.isActionModeShowed()) { - processRowSelect(cell); - return; - } - if (chat != null && chat.id != dialog_id) { - Bundle args = new Bundle(); - args.putInt("chat_id", chat.id); - if (postId != 0) { - args.putInt("message_id", postId); - } - - presentFragment(new ChatActivity(args), true); - } - } - @Override public void didLongPressed(ChatMessageCell cell) { handleClick(cell, true);