From b6711aa619e86f23bd57ea2cf49ba8af04412f47 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Wed, 26 Oct 2016 17:20:33 +0200 Subject: [PATCH] Remove dead code, prepare sending messages with attachments. --- TMessagesProj/jni/Android.mk | 1 + TMessagesProj/jni/mr_wrapper.c | 18 ++- .../messenger/MessagesController.java | 6 +- .../org/telegram/messenger/MrMailbox.java | 14 +- .../messenger/SendMessagesHelper.java | 10 +- .../telegram/messenger/query/DraftQuery.java | 114 ----------------- .../main/java/org/telegram/tgnet/TLRPC.java | 120 +++++++++++++++--- .../java/org/telegram/ui/ProfileActivity.java | 2 + 8 files changed, 142 insertions(+), 143 deletions(-) diff --git a/TMessagesProj/jni/Android.mk b/TMessagesProj/jni/Android.mk index 5765cd895..6ab1a692d 100644 --- a/TMessagesProj/jni/Android.mk +++ b/TMessagesProj/jni/Android.mk @@ -1651,6 +1651,7 @@ LOCAL_SRC_FILES += \ ../../../messenger-backend/src/mrmsg.c \ ../../../messenger-backend/src/mrmsglist.c \ ../../../messenger-backend/src/mrosnative.c \ +../../../messenger-backend/src/mrparam.c \ ../../../messenger-backend/src/mrpoortext.c \ ../../../messenger-backend/src/mrsimplify.c \ ../../../messenger-backend/src/mrsqlite3.c \ diff --git a/TMessagesProj/jni/mr_wrapper.c b/TMessagesProj/jni/mr_wrapper.c index 4d4a08232..fea3efe72 100644 --- a/TMessagesProj/jni/mr_wrapper.c +++ b/TMessagesProj/jni/mr_wrapper.c @@ -381,7 +381,23 @@ JNIEXPORT jint Java_org_telegram_messenger_MrMailbox_MrChatSetDraft(JNIEnv *env, } -JNIEXPORT jint Java_org_telegram_messenger_MrMailbox_MrChatSendMsg(JNIEnv *env, jclass c, jlong hChat, jstring text) +JNIEXPORT jint Java_org_telegram_messenger_MrMailbox_MrChatSendText(JNIEnv *env, jclass c, jlong hChat, jstring text) +{ + jint msg_id = 0; + if( text ) { + mrmsg_t* msg = mrmsg_new(); + msg->m_type = MR_MSG_TEXT; + CHAR_REF(text); + msg->m_text = strdup(textPtr); + CHAR_UNREF(text); + msg_id = mrchat_send_msg((mrchat_t*)hChat, msg); + mrmsg_unref(msg); + } + return msg_id; +} + + +JNIEXPORT jint Java_org_telegram_messenger_MrMailbox_MrChatSendMedia(JNIEnv *env, jclass c, jlong hChat, jint type, jstring file, jint w, jint h, jint ms) { jint msg_id = 0; if( text ) { diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java b/TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java index 2bf9cd1fb..0e4d7ead6 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java @@ -3732,6 +3732,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter return 0; } + /* public void convertToMegaGroup(final Context context, int chat_id) { TLRPC.TL_messages_migrateChat req = new TLRPC.TL_messages_migrateChat(); req.chat_id = chat_id; @@ -3795,6 +3796,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter //don't promt } } + */ public void addUserToChat(final int chat_id, final TLRPC.User user, final TLRPC.ChatFull info, int count_fwd, String botHash, final BaseFragment fragment) { /* @@ -5068,10 +5070,10 @@ public class MessagesController implements NotificationCenter.NotificationCenter update instanceof TLRPC.TL_updateReadHistoryOutbox || update instanceof TLRPC.TL_updateDeleteMessages || update instanceof TLRPC.TL_updateWebPage || update instanceof TLRPC.TL_updateEditMessage) { return 0; - } else if (update instanceof TLRPC.TL_updateNewEncryptedMessage) { + /*} else if (update instanceof TLRPC.TL_updateNewEncryptedMessage) { return 1; } else if (update instanceof TLRPC.TL_updateNewChannelMessage || update instanceof TLRPC.TL_updateDeleteChannelMessages || update instanceof TLRPC.TL_updateEditChannelMessage) { - return 2; + return 2;*/ } else { return 3; } diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java b/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java index 4ab19ae4c..4d2978e65 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java @@ -165,7 +165,8 @@ public class MrMailbox { public native static int MrChatGetTotalMsgCount (long hChat); public native static long MrChatGetSummary (long hChat); // returns hPoortext public native static long MrChatGetMsglist (long hChat, int offset, int amount); // returns hMsglist - public native static int MrChatSendMsg (long hChat, String text); // returns message id + public native static int MrChatSendText (long hChat, String text); // returns message id + public native static int MrChatSendMedia (long hChat, int type, String file, int w, int h, int ms); // MrMsglist objects public native static void MrMsglistUnref (long hMsglist); @@ -200,13 +201,20 @@ public class MrMailbox { public native static String MrGetVersionStr (); public native static String CPtr2String (long hString); // get strings eg. from data1 from the callback - public final static int MR_CHAT_UNDEFINED = 0; + public final static int MR_CHAT_UNDEFINED = 0; public final static int MR_CHAT_NORMAL = 100; public final static int MR_CHAT_GROUP = 120; public final static int MR_CHAT_ID_STRANGERS = 1; - public final static int MR_STATE_UNDEFINED = 0; + public final static int MR_MSG_UNDEFINED = 0; + public final static int MR_MSG_TEXT = 10; + public final static int MR_MSG_IMAGE = 20; + public final static int MR_MSG_AUDIO = 40; + public final static int MR_MSG_VIDEO = 50; + public final static int MR_MSG_FILE = 60; + + public final static int MR_STATE_UNDEFINED = 0; public final static int MR_IN_UNREAD = 10; public final static int MR_IN_READ = 16; public final static int MR_OUT_PENDING = 20; diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java b/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java index c197f7c0a..6ef2db6c5 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java @@ -183,7 +183,7 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter } */ - + protected class DelayedMessage { public TLObject sendRequest; public TLRPC.TL_decryptedMessage sendEncryptedRequest; @@ -1516,7 +1516,7 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter if (type == 0 /*|| type == 9 && message != null && encryptedChat != null*/ ) { - newMsg.id = MrMailbox.MrChatSendMsg(hChat, newMsg.message); + newMsg.id = MrMailbox.MrChatSendText(hChat, newMsg.message); DraftQuery.cleanDraft(peer, false); } else if (type >= 1 && type <= 3 || type >= 5 && type <= 8 /*|| type == 9 && encryptedChat != null*/) { @@ -1640,6 +1640,7 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter } } + /* TLObject reqSend; { @@ -1688,6 +1689,7 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter performSendMessageRequest(reqSend, newMsgObj, null); } } + */ } } else if (type == 4) { /* @@ -1791,8 +1793,8 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter return isSending; } + /* private void performSendMessageRequest(final TLObject req, final MessageObject msgObj, final String originalPath) { - /* final TLRPC.Message newMsgObj = msgObj.messageOwner; putToSendingMessages(newMsgObj); ConnectionsManager.getInstance().sendRequest(req, new RequestDelegate() { @@ -1943,8 +1945,8 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter }); } }, ConnectionsManager.RequestFlagCanCompress | ConnectionsManager.RequestFlagInvokeAfter | (req instanceof TLRPC.TL_messages_sendMessage ? ConnectionsManager.RequestFlagNeedQuickAck : 0)); - */ } + */ /* private void updateMediaPaths(MessageObject newMsgObj, TLRPC.Message sentMessage, String originalPath, boolean post) { diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/query/DraftQuery.java b/TMessagesProj/src/main/java/org/telegram/messenger/query/DraftQuery.java index 31f5a2802..7933212fd 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/query/DraftQuery.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/query/DraftQuery.java @@ -180,120 +180,6 @@ public class DraftQuery { */ } - public static void saveDraft(final long did, TLRPC.DraftMessage draft, TLRPC.Message replyToMessage, boolean fromServer) { - if( draft == null || draft instanceof TLRPC.TL_draftMessageEmpty ) { - saveDraft__(did, null, 0); - } - else { - saveDraft__(did, draft.toString(), 0); - } - /* EDIT BY MR - SharedPreferences.Editor editor = preferences.edit(); - if (draft == null || draft instanceof TLRPC.TL_draftMessageEmpty) { - drafts.remove(did); - draftMessages.remove(did); - preferences.edit().remove("" + did).remove("r_" + did).commit(); - } else { - drafts.put(did, draft); - try { - SerializedData serializedData = new SerializedData(draft.getObjectSize()); - draft.serializeToStream(serializedData); - editor.putString("" + did, Utilities.bytesToHex(serializedData.toByteArray())); - } catch (Exception e) { - FileLog.e("tmessages", e); - } - } - if (replyToMessage == null) { - draftMessages.remove(did); - editor.remove("r_" + did); - } else { - draftMessages.put(did, replyToMessage); - SerializedData serializedData = new SerializedData(replyToMessage.getObjectSize()); - replyToMessage.serializeToStream(serializedData); - editor.putString("r_" + did, Utilities.bytesToHex(serializedData.toByteArray())); - } - editor.commit(); - if (fromServer) { - if (draft.reply_to_msg_id != 0 && replyToMessage == null) { - int lower_id = (int) did; - TLRPC.User user = null; - TLRPC.Chat chat = null; - if (lower_id > 0) { - user = MessagesController.getInstance().getUser(lower_id); - } else { - chat = MessagesController.getInstance().getChat(-lower_id); - } - if (user != null || chat != null) { - long messageId = draft.reply_to_msg_id; - final int channelIdFinal; - if (ChatObject.isChannel(chat)) { - messageId |= ((long) chat.id) << 32; - channelIdFinal = chat.id; - } else { - channelIdFinal = 0; - } - final long messageIdFinal = messageId; - - MessagesStorage.getInstance().getStorageQueue().postRunnable(new Runnable() { - @Override - public void run() { - try { - TLRPC.Message message = null; - SQLiteCursor cursor = MessagesStorage.getInstance().getDatabase().queryFinalized(String.format(Locale.US, "SELECT data FROM messages WHERE mid = %d", messageIdFinal)); - if (cursor.next()) { - NativeByteBuffer data = cursor.byteBufferValue(0); - if (data != null) { - message = TLRPC.Message.TLdeserialize(data, data.readInt32(false), false); - data.reuse(); - } - } - cursor.dispose(); - if (message == null) { - if (channelIdFinal != 0) { - final TLRPC.TL_channels_getMessages req = new TLRPC.TL_channels_getMessages(); - req.channel = MessagesController.getInputChannel(channelIdFinal); - req.id.add((int) messageIdFinal); - ConnectionsManager.getInstance().sendRequest(req, new RequestDelegate() { - @Override - public void run(TLObject response, TLRPC.TL_error error) { - if (error == null) { - TLRPC.messages_Messages messagesRes = (TLRPC.messages_Messages) response; - if (!messagesRes.messages.isEmpty()) { - saveDraftReplyMessage(did, messagesRes.messages.get(0)); - } - } - } - }); - } else { - TLRPC.TL_messages_getMessages req = new TLRPC.TL_messages_getMessages(); - req.id.add((int) messageIdFinal); - ConnectionsManager.getInstance().sendRequest(req, new RequestDelegate() { - @Override - public void run(TLObject response, TLRPC.TL_error error) { - if (error == null) { - TLRPC.messages_Messages messagesRes = (TLRPC.messages_Messages) response; - if (!messagesRes.messages.isEmpty()) { - saveDraftReplyMessage(did, messagesRes.messages.get(0)); - } - } - } - }); - } - } else { - saveDraftReplyMessage(did, message); - } - } catch (Exception e) { - FileLog.e("tmessages", e); - } - } - }); - } - } - NotificationCenter.getInstance().postNotificationName(NotificationCenter.newDraftReceived, did); - } - */ - } - /* EDIT BY MR private static void saveDraftReplyMessage(final long did, final TLRPC.Message message) { if (message == null) { diff --git a/TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java b/TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java index 2bf5c2dcd..46f6f4073 100644 --- a/TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java +++ b/TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java @@ -73,10 +73,10 @@ public class TLRPC { DraftMessage result = null; switch(constructor) { case 0xba4baec5: - result = new TL_draftMessageEmpty(); + //result = new TL_draftMessageEmpty(); break; case 0xfd8e711f: - result = new TL_draftMessage(); + //result = new TL_draftMessage(); break; } if (result == null && exception) { @@ -89,6 +89,7 @@ public class TLRPC { } } + /* public static class TL_draftMessageEmpty extends DraftMessage { public static int constructor = 0xba4baec5; @@ -148,6 +149,7 @@ public class TLRPC { stream.writeInt32(date); } } + */ public static class ChatPhoto extends TLObject { public FileLocation photo_small; @@ -198,6 +200,7 @@ public class TLRPC { } } + /* public static class TL_help_termsOfService extends TLObject { public static int constructor = 0xf1ee3e90; @@ -225,6 +228,7 @@ public class TLRPC { stream.writeString(text); } } + */ public static class NotifyPeer extends TLObject { public Peer peer; @@ -7632,6 +7636,7 @@ public class TLRPC { } } + /* public static class TL_inputAppEvent extends TLObject { public static int constructor = 0x770656a8; @@ -7668,6 +7673,7 @@ public class TLRPC { stream.writeString(data); } } + */ public static class TL_messages_affectedHistory extends TLObject { public static int constructor = 0xb45c69d1; @@ -7720,6 +7726,7 @@ public class TLRPC { public static Document TLdeserialize(AbstractSerializedData stream, int constructor, boolean exception) { Document result = null; + /* switch(constructor) { case 0x55555556: result = new TL_documentEncrypted_old(); @@ -7743,6 +7750,7 @@ public class TLRPC { if (result != null) { result.readParams(stream, exception); } + */ return result; } } @@ -8151,6 +8159,7 @@ public class TLRPC { public static InputMedia TLdeserialize(AbstractSerializedData stream, int constructor, boolean exception) { InputMedia result = null; + /* switch(constructor) { case 0xad613491: result = new TL_inputMediaUploadedThumbDocument(); @@ -8189,6 +8198,7 @@ public class TLRPC { if (result != null) { result.readParams(stream, exception); } + */ return result; } } @@ -8815,6 +8825,7 @@ public class TLRPC { } } + /* public static class TL_messages_messageEditData extends TLObject { public static int constructor = 0x26b5dde6; @@ -8845,6 +8856,7 @@ public class TLRPC { stream.writeInt32(flags); } } + */ public static class TL_contacts_importedContacts extends TLObject { public static int constructor = 0xad524315; @@ -9048,6 +9060,7 @@ public class TLRPC { public static Update TLdeserialize(AbstractSerializedData stream, int constructor, boolean exception) { Update result = null; + /* switch(constructor) { case 0xea4b0e5c: result = new TL_updateChatParticipantAdd(); @@ -9116,7 +9129,7 @@ public class TLRPC { result = new TL_updatePrivacy(); break; case 0x2cbd95af: - //result = new TL_updateInlineBotCallbackQuery(); + result = new TL_updateInlineBotCallbackQuery(); break; case 0x25d6c9c7: result = new TL_updateReadChannelOutbox(); @@ -9155,7 +9168,7 @@ public class TLRPC { result = new TL_updateUserName(); break; case 0xe48f964: - //result = new TL_updateBotInlineSend(); + result = new TL_updateBotInlineSend(); break; case 0xe40370a3: result = new TL_updateEditMessage(); @@ -9206,10 +9219,12 @@ public class TLRPC { if (result != null) { result.readParams(stream, exception); } + */ return result; } } + /* public static class TL_updateChatParticipantAdd extends Update { public static int constructor = 0xea4b0e5c; @@ -9623,6 +9638,7 @@ public class TLRPC { } } } + */ /* public static class TL_updateInlineBotCallbackQuery extends Update { @@ -10211,6 +10227,7 @@ public class TLRPC { } } + /* public static class TL_receivedNotifyMessage extends TLObject { public static int constructor = 0xa384b779; @@ -10241,6 +10258,7 @@ public class TLRPC { stream.writeInt32(flags); } } + */ public static class InputEncryptedFile extends TLObject { public long id; @@ -11444,6 +11462,7 @@ public class TLRPC { } } + /* public static class TL_geochats_statedMessage extends TLObject { public static int constructor = 0x17b1578b; @@ -11518,6 +11537,7 @@ public class TLRPC { stream.writeInt32(seq); } } + */ public static class TL_contact extends TLObject { public static int constructor = 0xf911c994; @@ -11785,6 +11805,7 @@ public class TLRPC { } } + /* public static class TL_help_support extends TLObject { public static int constructor = 0x17c6b5f6; @@ -11815,6 +11836,7 @@ public class TLRPC { user.serializeToStream(stream); } } + */ public static class TL_messages_chats extends TLObject { public static int constructor = 0x64ff9fd5; @@ -14424,6 +14446,7 @@ public class TLRPC { } } + /* public static class TL_geochats_located extends TLObject { public static int constructor = 0x48feb267; @@ -14558,6 +14581,7 @@ public class TLRPC { stream.writeInt32(constructor); } } + */ public static class TL_messageFwdHeader extends TLObject { public static int constructor = 0xc786ddcb; @@ -14906,6 +14930,7 @@ public class TLRPC { } } + /* public static class TL_contactFound extends TLObject { public static int constructor = 0xea879f95; @@ -14933,6 +14958,7 @@ public class TLRPC { stream.writeInt32(user_id); } } + */ public static class ExportedChatInvite extends TLObject { public String link; @@ -15084,6 +15110,7 @@ public class TLRPC { } } + /* public static class TL_userFull extends TLObject { public static int constructor = 0x5932fc03; @@ -15144,6 +15171,7 @@ public class TLRPC { } } } + */ public static class Updates extends TLObject { public ArrayList updates = new ArrayList<>(); @@ -15688,6 +15716,7 @@ public class TLRPC { } } + /* public static class TL_nearestDc extends TLObject { public static int constructor = 0x8e1a1775; @@ -15721,6 +15750,7 @@ public class TLRPC { stream.writeInt32(nearest_dc); } } + */ public static class InputPhoto extends TLObject { public long id; @@ -15997,6 +16027,7 @@ public class TLRPC { } } + /* public static class TL_account_passwordInputSettings extends TLObject { public static int constructor = 0x86916deb; @@ -16052,6 +16083,7 @@ public class TLRPC { } } } + */ public static class TL_dcOption extends TLObject { public static int constructor = 0x5d8c6cc; @@ -16139,6 +16171,7 @@ public class TLRPC { } } + /* public static class TL_messages_peerDialogs extends TLObject { public static int constructor = 0x3371c354; @@ -16254,6 +16287,7 @@ public class TLRPC { state.serializeToStream(stream); } } + */ public static class TL_topPeer extends TLObject { public static int constructor = 0xedcdc05b; @@ -16352,7 +16386,7 @@ public class TLRPC { result = new TL_messages_dialogs(); break; case 0x71e094f3: - result = new TL_messages_dialogsSlice(); + //result = new TL_messages_dialogsSlice(); break; } if (result == null && exception) { @@ -16461,6 +16495,7 @@ public class TLRPC { } } + /* public static class TL_messages_dialogsSlice extends messages_Dialogs { public static int constructor = 0x71e094f3; @@ -16605,6 +16640,7 @@ public class TLRPC { } } } + */ /* public static class TL_auth_checkPhone extends TLObject { @@ -16705,9 +16741,7 @@ public class TLRPC { stream.writeInt32(constructor); } } - */ - /* public static class TL_auth_resetAuthorizations extends TLObject { public static int constructor = 0x9fab0d1a; @@ -16774,9 +16808,7 @@ public class TLRPC { stream.writeByteArray(bytes); } } - */ - /* public static class TL_auth_bindTempAuthKey extends TLObject { public static int constructor = 0xcdd42a05; @@ -16797,7 +16829,6 @@ public class TLRPC { stream.writeByteArray(encrypted_message); } } - */ public static class TL_account_registerDevice extends TLObject { public static int constructor = 0x637ea878; @@ -16833,7 +16864,6 @@ public class TLRPC { } } - /* public static class TL_account_updateNotifySettings extends TLObject { public static int constructor = 0x84be5b93; @@ -16850,9 +16880,7 @@ public class TLRPC { settings.serializeToStream(stream); } } - */ - /* public static class TL_account_getNotifySettings extends TLObject { public static int constructor = 0x12b3ad31; @@ -16948,9 +16976,7 @@ public class TLRPC { stream.writeInt32(constructor); } } - */ - /* public static class TL_users_getUsers extends TLObject { public static int constructor = 0xd91a548; @@ -16979,9 +17005,7 @@ public class TLRPC { } } } - */ - /* public static class TL_account_reportPeer extends TLObject { public static int constructor = 0xae189d5f; @@ -16998,7 +17022,6 @@ public class TLRPC { reason.serializeToStream(stream); } } - */ public static class TL_users_getFullUser extends TLObject { public static int constructor = 0xca30a5b1; @@ -17014,6 +17037,7 @@ public class TLRPC { id.serializeToStream(stream); } } + */ public static class TL_contacts_getStatuses extends TLObject { public static int constructor = 0xc4a353ee; @@ -17074,6 +17098,7 @@ public class TLRPC { } } + /* public static class TL_contacts_deleteContact extends TLObject { public static int constructor = 0x8e953744; @@ -17088,6 +17113,7 @@ public class TLRPC { id.serializeToStream(stream); } } + */ public static class TL_contacts_deleteContacts extends TLObject { public static int constructor = 0x59ab389e; @@ -17156,6 +17182,7 @@ public class TLRPC { } } + /* public static class TL_contacts_exportCard extends TLObject { public static int constructor = 0x84e53737; @@ -17193,6 +17220,7 @@ public class TLRPC { } } } + */ public static class TL_messages_getMessages extends TLObject { public static int constructor = 0x4222fa74; @@ -17293,6 +17321,7 @@ public class TLRPC { } } + /* public static class TL_messages_readHistory extends TLObject { public static int constructor = 0xe306d3a; @@ -17381,6 +17410,7 @@ public class TLRPC { stream.writeInt32(chat_id); } } + */ public static class TL_messages_searchGlobal extends TLObject { public static int constructor = 0x9e3cacb0; @@ -17405,6 +17435,7 @@ public class TLRPC { } } + /* public static class TL_messages_deleteMessages extends TLObject { public static int constructor = 0xa5f18925; @@ -17614,7 +17645,7 @@ public class TLRPC { } } - public static class TL_messages_getPeerSettings extends TLObject { + public static class TL_messages_getPeerSettings extends TLObject { public static int constructor = 0x3672e09c; public InputPeer peer; @@ -17663,6 +17694,7 @@ public class TLRPC { stream.writeInt32(chat_id); } } + */ public static class TL_messages_editChatTitle extends TLObject { public static int constructor = 0xdc452855; @@ -17698,6 +17730,7 @@ public class TLRPC { } } + /* public static class TL_messages_addChatUser extends TLObject { public static int constructor = 0xf9a0aa09; @@ -17733,6 +17766,7 @@ public class TLRPC { user_id.serializeToStream(stream); } } + */ public static class TL_messages_createChat extends TLObject { public static int constructor = 0x9cb126e; @@ -17756,6 +17790,7 @@ public class TLRPC { } } + /* public static class TL_updates_getState extends TLObject { public static int constructor = 0xedd4882a; @@ -17808,6 +17843,7 @@ public class TLRPC { stream.writeInt32(limit); } } + */ public static class TL_photos_updateProfilePhoto extends TLObject { public static int constructor = 0xeef579a0; @@ -17891,6 +17927,7 @@ public class TLRPC { } } + /* public static class TL_help_getConfig extends TLObject { public static int constructor = 0xc4f9186b; @@ -17962,6 +17999,7 @@ public class TLRPC { stream.writeInt32(constructor); } } + */ public static class TL_photos_getUserPhotos extends TLObject { public static int constructor = 0x91cd32a8; @@ -17984,6 +18022,7 @@ public class TLRPC { } } + /* public static class TL_messages_forwardMessage extends TLObject { public static int constructor = 0x33963bf9; @@ -18385,7 +18424,9 @@ public class TLRPC { stream.writeInt32(max_qts); } } + */ + /* public static class TL_help_getSupport extends TLObject { public static int constructor = 0x9cdf08cd; @@ -18418,7 +18459,9 @@ public class TLRPC { } } } + */ + /* public static class TL_account_checkUsername extends TLObject { public static int constructor = 0x2714d86c; @@ -18448,6 +18491,7 @@ public class TLRPC { stream.writeString(username); } } + */ public static class TL_contacts_search extends TLObject { public static int constructor = 0x11f812d8; @@ -18481,6 +18525,7 @@ public class TLRPC { } } + /* public static class TL_account_setPrivacy extends TLObject { public static int constructor = 0xc9f81ce8; @@ -18502,6 +18547,7 @@ public class TLRPC { } } } + */ public static class TL_account_deleteAccount extends TLObject { public static int constructor = 0x418d4e0b; @@ -18531,6 +18577,7 @@ public class TLRPC { } } + /* public static class TL_account_setAccountTTL extends TLObject { public static int constructor = 0x2442485e; @@ -18545,6 +18592,7 @@ public class TLRPC { ttl.serializeToStream(stream); } } + */ public static class TL_contacts_resolveUsername extends TLObject { public static int constructor = 0xf93ccba3; @@ -18609,6 +18657,7 @@ public class TLRPC { } } + /* public static class TL_account_sendChangePhoneCode extends TLObject { public static int constructor = 0x8e57deb; @@ -18631,7 +18680,9 @@ public class TLRPC { } } } + */ + /* public static class TL_account_changePhone extends TLObject { public static int constructor = 0x70c32edb; @@ -18650,7 +18701,9 @@ public class TLRPC { stream.writeString(phone_code); } } + */ + /* public static class TL_messages_getStickers extends TLObject { public static int constructor = 0xae22e045; @@ -18667,6 +18720,7 @@ public class TLRPC { stream.writeString(hash); } } + */ public static class TL_messages_getAllStickers extends TLObject { public static int constructor = 0x1c9618b1; @@ -18683,6 +18737,7 @@ public class TLRPC { } } + /* public static class TL_account_updateDeviceLocked extends TLObject { public static int constructor = 0x38df3532; @@ -18697,6 +18752,7 @@ public class TLRPC { stream.writeInt32(period); } } + */ public static class TL_messages_getWebPagePreview extends TLObject { public static int constructor = 0x25223e24; @@ -18713,6 +18769,7 @@ public class TLRPC { } } + /* public static class TL_account_getAuthorizations extends TLObject { public static int constructor = 0xe320c158; @@ -18740,6 +18797,7 @@ public class TLRPC { stream.writeInt64(hash); } } + */ public static class TL_account_getPassword extends TLObject { public static int constructor = 0x548a30f5; @@ -18754,6 +18812,7 @@ public class TLRPC { } } + /* public static class TL_account_getPasswordSettings extends TLObject { public static int constructor = 0xbc8d11bb; @@ -18768,7 +18827,9 @@ public class TLRPC { stream.writeByteArray(current_password_hash); } } + */ + /* public static class TL_account_updatePasswordSettings extends TLObject { public static int constructor = 0xfa7c4b86; @@ -18785,6 +18846,7 @@ public class TLRPC { new_settings.serializeToStream(stream); } } + */ public static class TL_auth_checkPassword extends TLObject { public static int constructor = 0xa63011e; @@ -18955,6 +19017,7 @@ public class TLRPC { } } + /* public static class TL_messages_startBot extends TLObject { public static int constructor = 0xe6df7378; @@ -18975,6 +19038,7 @@ public class TLRPC { stream.writeString(start_param); } } + */ public static class TL_messages_getMessagesViews extends TLObject { public static int constructor = 0xc4c8a55d; @@ -19137,6 +19201,7 @@ public class TLRPC { } */ + /* public static class TL_messages_editMessage extends TLObject { public static int constructor = 0xce91e4ca; @@ -19174,7 +19239,9 @@ public class TLRPC { } } } + */ + /* public static class TL_messages_getBotCallbackAnswer extends TLObject { public static int constructor = 0xa6e94f04; @@ -19193,7 +19260,9 @@ public class TLRPC { stream.writeByteArray(data); } } + */ + /* public static class TL_messages_setBotCallbackAnswer extends TLObject { public static int constructor = 0x481c591a; @@ -19216,7 +19285,9 @@ public class TLRPC { } } } + */ + /* public static class TL_messages_getPeerDialogs extends TLObject { public static int constructor = 0x2d9776b9; @@ -19236,6 +19307,7 @@ public class TLRPC { } } } + */ /* public static class TL_messages_editInlineBotMessage extends TLObject { @@ -19326,6 +19398,7 @@ public class TLRPC { } */ + /* public static class TL_help_getAppChangelog extends TLObject { public static int constructor = 0xb921197a; @@ -19338,7 +19411,9 @@ public class TLRPC { stream.writeInt32(constructor); } } + */ + /* public static class TL_help_getTermsOfService extends TLObject { public static int constructor = 0x350170f3; @@ -19351,7 +19426,9 @@ public class TLRPC { stream.writeInt32(constructor); } } + */ + /* public static class TL_messages_reorderStickerSets extends TLObject { public static int constructor = 0x9fcfbc30; @@ -19371,7 +19448,9 @@ public class TLRPC { } } } + */ + /* public static class TL_messages_getDocumentByHash extends TLObject { public static int constructor = 0x338e2464; @@ -19390,7 +19469,9 @@ public class TLRPC { stream.writeString(mime_type); } } + */ + /* public static class TL_channels_readHistory extends TLObject { public static int constructor = 0xcc104937; @@ -19407,6 +19488,7 @@ public class TLRPC { stream.writeInt32(max_id); } } + */ public static class TL_channels_deleteMessages extends TLObject { public static int constructor = 0x84c1fd4e; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java index 2637e02d0..4a39e20f3 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java @@ -669,6 +669,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. presentFragment(new ChannelUsersActivity(args)); */ } else if (position == convertRow) { + /* AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity()); builder.setMessage(LocaleController.getString("ConvertGroupAlert", R.string.ConvertGroupAlert)); builder.setTitle(LocaleController.getString("ConvertGroupAlertWarning", R.string.ConvertGroupAlertWarning)); @@ -680,6 +681,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. }); builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null); showDialog(builder.create()); + */ } else { processOnClickOrPress(position); }