From 4446ed079252c45c2bef7faa636be39538631c35 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 10 Feb 2017 16:29:58 +0100 Subject: [PATCH] Remove unused peer/empty class. --- .../com/b44t/messenger/MessageObject.java | 2 +- .../b44t/messenger/MessagesController.java | 30 ------------------- .../main/java/com/b44t/messenger/TLRPC.java | 12 -------- 3 files changed, 1 insertion(+), 43 deletions(-) diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java b/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java index 5bb5c068c..a471c74e0 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java @@ -1367,7 +1367,7 @@ public class MessageObject { } public boolean isReply() { - return !(replyMessageObject != null && replyMessageObject.messageOwner instanceof TLRPC.TL_messageEmpty) && (messageOwner.reply_to_msg_id != 0 || messageOwner.reply_to_random_id != 0) && (messageOwner.flags & TLRPC.MESSAGE_FLAG_REPLY) != 0; + return (messageOwner.reply_to_msg_id != 0 || messageOwner.reply_to_random_id != 0) && (messageOwner.flags & TLRPC.MESSAGE_FLAG_REPLY) != 0; } public boolean isMediaEmpty() { diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MessagesController.java b/MessengerProj/src/main/java/com/b44t/messenger/MessagesController.java index 9cccab36f..c9a0b62ef 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MessagesController.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MessagesController.java @@ -91,36 +91,6 @@ public class MessagesController implements NotificationCenter.NotificationCenter fontSize = preferences.getInt("msg_font_size", SettingsActivity.defMsgFontSize()); } - /* - public static TLRPC.InputUser getInputUser(TLRPC.User user) { - if (user == null) { - return new TLRPC.TL_inputUserEmpty(); - } - TLRPC.InputUser inputUser; - if (user.id == UserConfig.getClientUserId()) { - inputUser = new TLRPC.TL_inputUserSelf(); - } else { - inputUser = new TLRPC.TL_inputUser(); - inputUser.user_id = user.id; - } - return inputUser; - } - - public static TLRPC.InputUser getInputUser(int user_id) { - TLRPC.User user = getInstance().getUser(user_id); - return getInputUser(user); - } - */ - - public static TLRPC.InputPeer getInputPeer(int id) { - TLRPC.InputPeer inputPeer; - { - inputPeer = new TLRPC.TL_inputPeerUser(); - inputPeer.user_id = id; - } - return inputPeer; - } - public static TLRPC.Peer getPeer(int id) { TLRPC.Peer inputPeer; /*if (id < 0) { diff --git a/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java b/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java index fb6725277..42450fe26 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java @@ -425,15 +425,6 @@ public class TLRPC { public static class TL_inputPhoto extends InputPhoto { } - public static class InputPeer extends TLObject { - public int user_id; - public int chat_id; - public int channel_id; - } - - public static class TL_inputPeerUser extends InputPeer { - } - public static class MessageMedia extends TLObject { public byte[] bytes; public Photo photo; @@ -478,9 +469,6 @@ public class TLRPC { public boolean created_by_mr; } - public static class TL_messageEmpty extends Message { - } - public static class TL_message extends Message { }