diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java b/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java index 8578b831b..93dbd33be 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java @@ -50,8 +50,9 @@ public class MrMailbox { public static TLRPC.TL_dialog hChatlist2dialog(long hChatlist, int index) { long hChat = MrMailbox.MrChatlistGetChatByIndex(hChatlist, index); - TLRPC.TL_dialog dlg = hChat2dialog(hChat); + TLRPC.TL_dialog dlg = hChat2dialog(hChat); MrMailbox.MrChatUnref(hChat); + return dlg; } diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java b/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java index 5dce7a3c0..3a51862da 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java @@ -1082,6 +1082,7 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter MrMailbox.MrChatUnref(hChat); + hChat = null; 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 dff11bd5c..86529c491 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/query/DraftQuery.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/query/DraftQuery.java @@ -85,7 +85,7 @@ public class DraftQuery { private static void saveDraft__(long did, String message, long replyToMessageId) // message may be null { long hChat = MrMailbox.MrMailboxGetChat(MrMailbox.hMailbox, (int)did); - MrMailbox.MrChatSetDraft(hChat, message, replyToMessageId); + MrMailbox.MrChatSetDraft(hChat, message, replyToMessageId); MrMailbox.MrChatUnref(hChat); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java index ab029941f..3eda05f67 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java @@ -3623,7 +3623,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate String cname = ""; if(currentUser!=null && isChat) { long hContact = MrMailbox.MrMailboxGetContact(MrMailbox.hMailbox, currentUser.id); - cname = MrMailbox.MrContactGetDisplayName(hContact); + cname = MrMailbox.MrContactGetDisplayName(hContact); MrMailbox.MrContactUnref(hContact); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java index 94e9b495d..2fa02c156 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java @@ -180,12 +180,9 @@ public class DialogCell extends BaseCell { currentDialogId = dialog.id; isDialogCell = true; index = i; - //dialogsType = type; - // EDIT BY MR MrMailbox.MrChatUnref(m_hChat); - m_hChat = MrMailbox.MrChatlistGetChatByIndex(MrMailbox.hCurrChatlist, i); // TODO: maybe this should move to update() - in general, how are updates handled? - // /EDIT BY MR + m_hChat = MrMailbox.MrChatlistGetChatByIndex(MrMailbox.hCurrChatlist, i); update(0); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java index d953ed800..978364487 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java @@ -2895,7 +2895,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not final int fromId = MrMailbox.MrMsgGetFromId(hMsg); long hContact = MrMailbox.MrMailboxGetContact(MrMailbox.hMailbox, fromId); - if( hContact==0 ) { MrMailbox.MrMsgUnref(hMsg); return; } String name = MrMailbox.MrContactGetNameNAddr(hContact); MrMailbox.MrContactUnref(hContact); @@ -3669,24 +3668,26 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not MessagesQuery.loadReplyMessagesForMessages(messArr, dialog_id); } */ + { + long hMsglist = MrMailbox.MrChatGetMsglist(m_hChat, 0, 100); - long hMsglist = MrMailbox.MrChatGetMsglist(m_hChat, 0, 100); + int mrCount = MrMailbox.MrMsglistGetCnt(hMsglist); + for (int a = mrCount - 1; a >= 0; a--) { + long hMsg = MrMailbox.MrMsglistGetMsgByIndex(hMsglist, a); + TLRPC.Message msg = MrMailbox.hMsg2Message(hMsg); + MessageObject msgDrawObj = new MessageObject(msg, null, true); + messages.add(0, msgDrawObj); + messagesDict[loadIndex].put(msg.id, msgDrawObj); + MrMailbox.MrMsgUnref(hMsg); + } - int mrCount = MrMailbox.MrMsglistGetCnt(hMsglist); - for (int a = mrCount-1; a >= 0 ; a-- ) { - long hMsg = MrMailbox.MrMsglistGetMsgByIndex(hMsglist, a); - TLRPC.Message msg = MrMailbox.hMsg2Message(hMsg); - MessageObject msgDrawObj = new MessageObject(msg, null, true); - messages.add(0, msgDrawObj); - messagesDict[loadIndex].put(msg.id, msgDrawObj); - MrMailbox.MrMsgUnref(hMsg); - } + if (MrMailbox.MrChatGetId(m_hChat) == MrMailbox.MR_CHAT_ID_STRANGERS) { + updateBottomOverlay(); + } - if( MrMailbox.MrChatGetId(m_hChat)==MrMailbox.MR_CHAT_ID_STRANGERS ) { - updateBottomOverlay(); - } + MrMailbox.MrMsglistUnref(hMsglist); + } - MrMailbox.MrMsglistUnref(hMsglist); /* EDIT BY MR -- the add loop int approximateHeightSum = 0; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java index c043b8fa8..568f26af3 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java @@ -361,9 +361,12 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter return; } - long hContact = MrMailbox.MrMailboxGetContact(MrMailbox.hMailbox, user.id); - String name = MrMailbox.MrContactGetNameNAddr(hContact); - MrMailbox.MrContactUnref(hContact); + String name = ""; + { + long hContact = MrMailbox.MrMailboxGetContact(MrMailbox.hMailbox, user.id); + name = MrMailbox.MrContactGetNameNAddr(hContact); + MrMailbox.MrContactUnref(hContact); + } AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity()); builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), new DialogInterface.OnClickListener() { @@ -539,9 +542,12 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter View textView = lf.inflate(R.layout.group_create_bubble, null); TextView text = (TextView)textView.findViewById(R.id.bubble_text_view); - long hContact = MrMailbox.MrMailboxGetContact(MrMailbox.hMailbox, user.id); - String name = MrMailbox.MrContactGetDisplayName(hContact); - MrMailbox.MrContactUnref(hContact); + String name =""; + { + long hContact = MrMailbox.MrMailboxGetContact(MrMailbox.hMailbox, user.id); + name = MrMailbox.MrContactGetDisplayName(hContact); + MrMailbox.MrContactUnref(hContact); + } text.setText(name + ", "); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java b/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java index fcfbf7641..46163b4be 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java @@ -2702,7 +2702,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat if( currentMessageObject!=null && currentMessageObject.messageOwner!=null ) { long hContact = MrMailbox.MrMailboxGetContact(MrMailbox.hMailbox, currentMessageObject.messageOwner.from_id); - nameTextView.setText(MrMailbox.MrContactGetDisplayName(hContact)); + nameTextView.setText(MrMailbox.MrContactGetDisplayName(hContact)); MrMailbox.MrContactUnref(hContact); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java index 10de4c2f0..f19cddb1f 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java @@ -411,9 +411,12 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. return; } - long hContact = MrMailbox.MrMailboxGetContact(MrMailbox.hMailbox, user_id); - String name = MrMailbox.MrContactGetNameNAddr(hContact); - MrMailbox.MrContactUnref(hContact); + String name = ""; + { + long hContact = MrMailbox.MrMailboxGetContact(MrMailbox.hMailbox, user_id); + name = MrMailbox.MrContactGetNameNAddr(hContact); + MrMailbox.MrContactUnref(hContact); + } AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity()); builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), new DialogInterface.OnClickListener() { @@ -1191,7 +1194,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. boolean blocked = false; if( user_id!=0 ) { long hContact = MrMailbox.MrMailboxGetContact(MrMailbox.hMailbox, user_id); - blocked = MrMailbox.MrContactIsBlocked(hContact)!=0; + blocked = MrMailbox.MrContactIsBlocked(hContact)!=0; MrMailbox.MrContactUnref(hContact); } return blocked;