diff --git a/TMessagesProj/jni/mr_wrapper.c b/TMessagesProj/jni/mr_wrapper.c index 00ab20e7e..69fac1542 100644 --- a/TMessagesProj/jni/mr_wrapper.c +++ b/TMessagesProj/jni/mr_wrapper.c @@ -108,9 +108,9 @@ JNIEXPORT jlong Java_org_telegram_messenger_MrMailbox_MrMailboxGetContactByIndex /* MrMailbox - handle chats */ -JNIEXPORT jlong Java_org_telegram_messenger_MrMailbox_MrMailboxGetChats(JNIEnv *env, jclass c, jlong hMailbox) +JNIEXPORT jlong Java_org_telegram_messenger_MrMailbox_MrMailboxGetChatlist(JNIEnv *env, jclass c, jlong hMailbox) { - return (jlong)mrmailbox_get_chats((mrmailbox_t*)hMailbox); + return (jlong)mrmailbox_get_chatlist((mrmailbox_t*)hMailbox); } @@ -234,9 +234,9 @@ JNIEXPORT jlong Java_org_telegram_messenger_MrMailbox_MrChatGetLastTimestamp(JNI } -JNIEXPORT jlong Java_org_telegram_messenger_MrMailbox_MrChatGetMsgs(JNIEnv *env, jclass c, jlong hChat, jint offset, jint amount) +JNIEXPORT jlong Java_org_telegram_messenger_MrMailbox_MrChatGetMsglist(JNIEnv *env, jclass c, jlong hChat, jint offset, jint amount) { - return (jlong)mrchat_get_msgs((mrchat_t*)hChat, offset, amount); + return (jlong)mrchat_get_msglist((mrchat_t*)hChat, offset, amount); } diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java b/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java index 3f6a599c4..ca4948a2d 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java @@ -67,7 +67,7 @@ public class MrMailbox { public native static int MrMailboxGetContactCnt (long hMailbox); public native static long MrMailboxGetContactByIndex (long hMailbox);// returns hContact which must be unref'd after usage - public native static long MrMailboxGetChats (long hMailbox); // returns hChatlist which must be unref'd after usage + public native static long MrMailboxGetChatlist (long hMailbox); // returns hChatlist which must be unref'd after usage public native static long MrMailboxGetChatById (long hMailbox, int id); // return hChat which must be unref'd after usage // MrChatlist objects @@ -85,7 +85,7 @@ public class MrMailbox { public native static long MrChatGetLastSummary (long hChat); // returns hPoortext public native static int MrChatGetLastState (long hChat); public native static long MrChatGetLastTimestamp (long hChat); - public native static long MrChatGetMsgs (long hChat, int offset, int amount); // returns hMsglist + public native static long MrChatGetMsglist (long hChat, int offset, int amount); // returns hMsglist // MrMsglist objects public native static void MrMsglistUnref (long hMsglist); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsAdapter.java index 8b9efa62c..47059764c 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsAdapter.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsAdapter.java @@ -42,7 +42,7 @@ public class DialogsAdapter extends RecyclerView.Adapter { // EDIT BY MR MrMailbox.MrChatlistUnref(MrMailbox.hCurrChatlist); - MrMailbox.hCurrChatlist = MrMailbox.MrMailboxGetChats(MrMailbox.hMailbox); + MrMailbox.hCurrChatlist = MrMailbox.MrMailboxGetChatlist(MrMailbox.hMailbox); // /EDIT BY MR } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java index 03140ac47..22097aced 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java @@ -587,7 +587,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not */ // EDIT BY MR - m_hMsglist = MrMailbox.MrChatGetMsgs(m_hChat, 0, 100); + m_hMsglist = MrMailbox.MrChatGetMsglist(m_hChat, 0, 100); { int count = 0; ArrayList objects = new ArrayList<>();