diff --git a/MessengerProj/src/main/java/com/b44t/messenger/AndroidUtilities.java b/MessengerProj/src/main/java/com/b44t/messenger/AndroidUtilities.java index 0a1745e40..051af35c1 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/AndroidUtilities.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/AndroidUtilities.java @@ -728,7 +728,7 @@ public class AndroidUtilities { TLRPC.FileLocation photo = null; shortcutIntent.putExtra("chatId", did); - MrChat mrChat = MrMailbox.getChat(MrMailbox.hMailbox, (int)did); + MrChat mrChat = MrMailbox.getChat((int)did); if( mrChat.getId() == 0 ) { return null; } String name = mrChat.getName(); diff --git a/MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java b/MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java index d5b67b5d6..6bd2fc79a 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java @@ -238,8 +238,8 @@ public class ApplicationLoader extends Application { // EDIT BY MR - open my sqlite file (you can inspect the file eg. with "Tools / Android Device Monitor / File Explorer") File dbfile = new File(getFilesDirFixed(), "messenger.db"); - MrMailbox.MrMailboxOpen(MrMailbox.hMailbox, dbfile.getAbsolutePath(), ""); - MrMailbox.MrMailboxConnect(MrMailbox.hMailbox); + MrMailbox.open(dbfile.getAbsolutePath(), ""); + MrMailbox.connect(); } @Override @@ -254,7 +254,7 @@ public class ApplicationLoader extends Application { // EDIT BY MR - create a MrMailbox object; as android stops the App by just killing it, we do never call MrMailboxUnref() // however, we may want to to have a look at onPause() eg. of activities (eg. for flushing data, if needed) MrMailbox.MrCallback(0, 0, 0); // do not remove this call; this makes sure, the function is not removed from build or warnings are printed! - MrMailbox.hMailbox = MrMailbox.MrMailboxNew(); + MrMailbox.init(); MrMailbox.MrStockAddStr(1, LocaleController.getString("NoMessages", R.string.NoMessages)); MrMailbox.MrStockAddStr(2, LocaleController.getString("FromSelf", R.string.FromSelf)); MrMailbox.MrStockAddStr(3, LocaleController.getString("Draft", R.string.Draft)); diff --git a/MessengerProj/src/main/java/com/b44t/messenger/ConnectionsManager.java b/MessengerProj/src/main/java/com/b44t/messenger/ConnectionsManager.java index c785f8184..51d865bf7 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/ConnectionsManager.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/ConnectionsManager.java @@ -47,10 +47,6 @@ public class ConnectionsManager { } } - public long getCurrentTimeMillis() { - return MrMailbox.getCurrentTimeMillis(); - } - public int getCurrentTime() { return MrMailbox.getCurrentTime(); } diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MrChat.java b/MessengerProj/src/main/java/com/b44t/messenger/MrChat.java index 687ce48ff..8325828ff 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MrChat.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MrChat.java @@ -106,6 +106,7 @@ public class MrChat { private native static int MrChatSendText (long hChat, String text); // returns message id private native static int MrChatSendMedia (long hChat, int type, String file, String mime, int w, int h, int time_ms); + /* additional functions that are not 1:1 available in the backend **********************************************************************************************/ @@ -113,10 +114,17 @@ public class MrChat { return 0; } - public static TLRPC.TL_dialog MrChat2dialog(MrChat mrChat) + public static TLRPC.Chat chatId2chat(int id) + { + TLRPC.Chat ret = new TLRPC.Chat(); + ret.id = id; + return ret; + } + + public TLRPC.TL_dialog get_TLRPC_TL_dialog() { TLRPC.TL_dialog ret = new TLRPC.TL_dialog(); - ret.id = mrChat.getId(); + ret.id = getId(); return ret; } diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MrChatlist.java b/MessengerProj/src/main/java/com/b44t/messenger/MrChatlist.java index dc5c4501d..5400f9174 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MrChatlist.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MrChatlist.java @@ -56,4 +56,15 @@ public class MrChatlist { private native static int MrChatlistGetCnt (long hChatlist); private native static long MrChatlistGetChatByIndex (long hChatlist, int index); // returns hChat which must be unref'd after usage private native static long MrChatlistGetSummaryByIndex(long hChatlist, int index, long hChat); + + + /* additional functions that are not 1:1 available in the backend + **********************************************************************************************/ + + public TLRPC.TL_dialog get_TLRPC_TL_dialog(int index) + { + MrChat chat = getChatByIndex(index); + TLRPC.TL_dialog dlg = chat.get_TLRPC_TL_dialog(); + return dlg; + } } diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MrContact.java b/MessengerProj/src/main/java/com/b44t/messenger/MrContact.java index 2f86529a1..bdb39eb0f 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MrContact.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MrContact.java @@ -64,6 +64,13 @@ public class MrContact { /* additional functions that are not 1:1 available in the backend **********************************************************************************************/ + public static TLRPC.User contactId2user(int id) + { + TLRPC.User ret = new TLRPC.User(); + ret.id = id; + return ret; + } + public String getDisplayName() { String s=MrContactGetName(m_hContact); if(s.isEmpty()) { diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java b/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java index 5bfc622ce..42f8f2186 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java @@ -31,45 +31,191 @@ package com.b44t.messenger; public class MrMailbox { - public static long hMailbox = 0; - public static MrChatlist mrCurrChatlist = new MrChatlist(0); - private static final String TAG = "LibreChat"; // TAG is an Android convention - - - // tools - - public static TLRPC.TL_dialog mrChatlist2dialog(MrChatlist mrChatlist, int index) - { - MrChat mrChat = mrChatlist.getChatByIndex(index); - TLRPC.TL_dialog dlg = MrChat.MrChat2dialog(mrChat); - return dlg; + public static void init () { + m_hMailbox = MrMailboxNew(); } - public static TLRPC.User contactId2user(int id) - { - TLRPC.User ret = new TLRPC.User(); - ret.id = id; - return ret; + public static int open(String dbfile, String blobdir) { + return MrMailboxOpen(m_hMailbox, dbfile, blobdir); } - public static TLRPC.Chat chatId2chat(int id) - { - TLRPC.Chat ret = new TLRPC.Chat(); - ret.id = id; - return ret; + public static void close() { + MrMailboxClose(m_hMailbox); } - public static void reloadMainChatlist() - { - mrCurrChatlist = getChatlist(hMailbox); + public static int configure() { + return MrMailboxConfigure(m_hMailbox); } - // this function is called from within the C-wrapper + public static int isConfigured() { + return MrMailboxIsConfigured(m_hMailbox); + } + + public static int connect() { + return MrMailboxConnect(m_hMailbox); + } + + public static void disconnect() { + MrMailboxDisconnect(m_hMailbox); + } + + public static int fetch() { + return MrMailboxFetch(m_hMailbox); + } + + public static int setConfig(String key, String value) { + return MrMailboxSetConfig(m_hMailbox, key, value); + } + + public static String getConfig(String key, String def) { + return MrMailboxGetConfig(m_hMailbox, key, def); + } + + public static int getConfigInt(String key, int def) { + return MrMailboxGetConfigInt(m_hMailbox, key, def); + } + + public static String getInfo() { + return MrMailboxGetInfo(m_hMailbox); + } + + public static String execute(String cmd) { + return MrMailboxExecute(m_hMailbox, cmd); + } + + private static long m_hMailbox = 0; + private native static long MrMailboxNew (); // returns hMailbox which must be unref'd after usage (Names as mrmailbox_new don't work due to the additional underscore) + private native static int MrMailboxOpen (long hMailbox, String dbfile, String blobdir); + private native static void MrMailboxClose (long hMailbox); + private native static int MrMailboxConfigure (long hMailbox); + private native static int MrMailboxIsConfigured (long hMailbox); + private native static int MrMailboxConnect (long hMailbox); + private native static void MrMailboxDisconnect (long hMailbox); + private native static int MrMailboxFetch (long hMailbox); + private native static int MrMailboxSetConfig (long hMailbox, String key, String value); // value may be NULL + private native static String MrMailboxGetConfig (long hMailbox, String key, String def); // def may be NULL, returns empty string as NULL + private native static int MrMailboxGetConfigInt (long hMailbox, String key, int def); // def may be NULL, returns empty string as NULL + private native static String MrMailboxGetInfo (long hMailbox); + private native static String MrMailboxExecute (long hMailbox, String cmd); + + + // contacts + public static int[] getKnownContacts(String query) { + return MrMailboxGetKnownContacts(m_hMailbox, query); + } + + public static int[] getBlockedContacts() { + return MrMailboxGetBlockedContacts(m_hMailbox); + } + + public static MrContact getContact(int contact_id) { + return new MrContact(MrMailboxGetContact(m_hMailbox, contact_id)); + } + + public static int createContact(String name, String addr) { + return MrMailboxCreateContact(m_hMailbox, name, addr); + } + + public static int blockContact(int id, int block) { + return MrMailboxBlockContact(m_hMailbox, id, block); + } + + public static int deleteContact(int id) { + return MrMailboxDeleteContact(m_hMailbox, id); + } + + public static int addAddressBook(String adrbook) { + return MrMailboxAddAddressBook(m_hMailbox, adrbook); + } + + private native static int[] MrMailboxGetKnownContacts (long hMailbox, String query); + private native static int[] MrMailboxGetBlockedContacts(long hMailbox); + private native static long MrMailboxGetContact (long hMailbox, int id);// returns hContact which must be unref'd after usage + private native static int MrMailboxCreateContact (long hMailbox, String name, String addr); + private native static int MrMailboxBlockContact (long hMailbox, int id, int block); + private native static int MrMailboxDeleteContact (long hMailbox, int id); // returns 0 if the contact could not be deleted (eg. it is in use, maybe by deaddrop) + private native static int MrMailboxAddAddressBook (long hMailbox, String adrbook); + + + // chats + public static MrChatlist getChatlist() { + return new MrChatlist(MrMailboxGetChatlist(m_hMailbox)); + } + + public static MrChat getChat(int contact_id) { + return new MrChat(MrMailboxGetChat(m_hMailbox, contact_id)); + } + + public static int markseenChat(int id) { + return MrMailboxMarkseenChat(m_hMailbox, id); + } + + public static int getChatIdByContactId (int contact_id) { + return MrMailboxGetChatIdByContactId(m_hMailbox, contact_id); + } + + public static int createChatByContactId(int contact_id) { + return MrMailboxCreateChatByContactId(m_hMailbox, contact_id); + } + + public static int[] getChatMsgs(int chat_id) { + return MrMailboxGetChatMsgs(m_hMailbox, chat_id); + } + + public static int[] getChatMedia(int chat_id, int msg_type, int or_msg_type) { + return MrMailboxGetChatMedia(m_hMailbox, chat_id, msg_type, or_msg_type); + } + + public static int[] getChatContacts(int chat_id) { + return MrMailboxGetChatContacts(m_hMailbox, chat_id); + } + + public static int deleteChat(int chat_id) { + return MrMailboxDeleteChat(m_hMailbox, chat_id); + } + + private native static long MrMailboxGetChatlist (long hMailbox); // returns hChatlist which must be unref'd after usage + private native static long MrMailboxGetChat (long hMailbox, int chat_id); // return hChat which must be unref'd after usage + private native static int MrMailboxMarkseenChat (long hMailbox, int id); + private native static int MrMailboxGetChatIdByContactId (long hMailbox, int contact_id); + private native static int MrMailboxCreateChatByContactId(long hMailbox, int contact_id); // returns chat_id + private native static int[] MrMailboxGetChatMsgs (long hMailbox, int chat_id); + private native static int[] MrMailboxGetChatMedia (long hMailbox, int chat_id, int msg_type, int or_msg_type); + private native static int[] MrMailboxGetChatContacts (long hMailbox, int chat_id); + private native static int MrMailboxDeleteChat (long hMailbox, int chat_id); + + + // msgs + public static MrMsg getMsg(int msg_id) { + return new MrMsg(MrMailboxGetMsg(m_hMailbox, msg_id)); + } + + public static String getMsgInfo(int id) { + return MrMailboxGetMsgInfo(m_hMailbox, id); + } + + public static void deleteMsg(int id) { + MrMailboxDeleteMsg(m_hMailbox, id); + } + + private native static long MrMailboxGetMsg (long hMailbox, int id); // return hMsg which must be unref'd after usage + private native static String MrMailboxGetMsgInfo (long hMailbox, int id); + private native static void MrMailboxDeleteMsg (long hMailbox, int id); + + // static + public native static void MrStockAddStr (int id, String str); + public native static String MrGetVersionStr (); + public native static String CPtr2String (long hString); // get strings eg. from data1 from the callback + + + /* receive events + **********************************************************************************************/ + public final static int MR_EVENT_MSGS_UPDATED = 2000; public final static int MR_EVENT_CONTACTS_CHANGED = 2030; public final static int MR_EVENT_MSG_DELIVERED = 3000; public final static int MR_EVENT_MSG_READ = 3010; - public static long MrCallback(final int event, final long data1, final long data2) + public static long MrCallback(final int event, final long data1, final long data2) // this function is called from within the C-wrapper { switch(event) { case MR_EVENT_MSGS_UPDATED: @@ -109,68 +255,14 @@ public class MrMailbox { return 0; } - // MrMailbox objects - public static MrMsg getMsg(long hMailbox, int msg_id) - { - return new MrMsg(MrMailboxGetMsg(hMailbox, msg_id)); - } - public static MrContact getContact(long hMailbox, int contact_id) - { - return new MrContact(MrMailboxGetContact(hMailbox, contact_id)); - } + /* additional functions that are not 1:1 available in the backend + **********************************************************************************************/ - public static MrChat getChat(long hMailbox, int contact_id) - { - return new MrChat(MrMailboxGetChat(hMailbox, contact_id)); - } - - public static MrChatlist getChatlist(long hMailbox) { - return new MrChatlist(MrMailboxGetChatlist(hMailbox)); - } - - public native static long MrMailboxNew (); // returns hMailbox which must be unref'd after usage (Names as mrmailbox_new don't work due to the additional underscore) - public native static int MrMailboxOpen (long hMailbox, String dbfile, String blobdir); - public native static void MrMailboxClose (long hMailbox); - public native static int MrMailboxConfigure (long hMailbox); - public native static int MrMailboxIsConfigured (long hMailbox); - public native static int MrMailboxConnect (long hMailbox); - public native static void MrMailboxDisconnect (long hMailbox); - public native static int MrMailboxFetch (long hMailbox); - - public native static int[] MrMailboxGetKnownContacts (long hMailbox, String query); - public native static int[] MrMailboxGetBlockedContacts(long hMailbox); - private native static long MrMailboxGetContact (long hMailbox, int id);// returns hContact which must be unref'd after usage - public native static int MrMailboxCreateContact (long hMailbox, String name, String addr); - public native static int MrMailboxBlockContact (long hMailbox, int id, int block); - public native static int MrMailboxDeleteContact (long hMailbox, int id); // returns 0 if the contact could not be deleted (eg. it is in use, maybe by deaddrop) - public native static int MrMailboxAddAddressBook (long hMailbox, String adrbook); - - private native static long MrMailboxGetChatlist (long hMailbox); // returns hChatlist which must be unref'd after usage - private native static long MrMailboxGetChat (long hMailbox, int chat_id); // return hChat which must be unref'd after usage - public native static int MrMailboxMarkseenChat (long hMailbox, int id); - public native static int MrMailboxGetChatIdByContactId (long hMailbox, int chat_id); - public native static int MrMailboxCreateChatByContactId(long hMailbox, int contact_id); // returns chat_id - public native static int[] MrMailboxGetChatMsgs (long hMailbox, int chat_id); - public native static int[] MrMailboxGetChatMedia (long hMailbox, int chat_id, int msg_type, int or_msg_type); - public native static int[] MrMailboxGetChatContacts (long hMailbox, int chat_id); - public native static int MrMailboxDeleteChat (long hMailbox, int chat_id); - private native static long MrMailboxGetMsg (long hMailbox, int id); // return hMsg which must be unref'd after usage - public native static String MrMailboxGetMsgInfo (long hMailbox, int id); - public native static void MrMailboxDeleteMsg (long hMailbox, int id); - public native static int MrMailboxSetConfig (long hMailbox, String key, String value); // value may be NULL - public native static String MrMailboxGetConfig (long hMailbox, String key, String def); // def may be NULL, returns empty string as NULL - public native static int MrMailboxGetConfigInt (long hMailbox, String key, int def); // def may be NULL, returns empty string as NULL - - public native static String MrMailboxGetInfo (long hMailbox); - public native static String MrMailboxExecute (long hMailbox, String cmd); - - // Tools - public native static void MrStockAddStr (int id, String str); - public native static String MrGetVersionStr (); - public native static String CPtr2String (long hString); // get strings eg. from data1 from the callback - - // some rest of T'gram ... - public native static long getCurrentTimeMillis (); + public static MrChatlist m_currChatlist = new MrChatlist(0); public native static int getCurrentTime (); + public static void reloadMainChatlist() + { + m_currChatlist = getChatlist(); + } } diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MrMsg.java b/MessengerProj/src/main/java/com/b44t/messenger/MrMsg.java index f24909e5a..702bf4a4a 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MrMsg.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MrMsg.java @@ -108,14 +108,14 @@ public class MrMsg { /* additional functions that are not 1:1 available in the backend **********************************************************************************************/ - public static TLRPC.Message MrMsg2Message(MrMsg mrMsg) + public TLRPC.Message get_TLRPC_Message() { TLRPC.Message ret = new TLRPC.TL_message(); // the class derived from TLRPC.Message defines the basic type: // TLRPC.TL_messageService is used to display messages as "You joined the group" // TLRPC.TL_message is a normal message (also photos?) - int state = mrMsg.getState(); - int type = mrMsg.getType(); + int state = getState(); + int type = getType(); switch( state ) { case MR_OUT_DELIVERED: ret.send_state = MessageObject.MESSAGE_SEND_STATE_SENT; break; case MR_OUT_ERROR: ret.send_state = MessageObject.MESSAGE_SEND_STATE_SEND_ERROR; break; @@ -123,12 +123,12 @@ public class MrMsg { case MR_OUT_READ: ret.send_state = MessageObject.MESSAGE_SEND_STATE_SENT; break; } - ret.id = mrMsg.getId(); - ret.from_id = mrMsg.getFromId(); + ret.id = getId(); + ret.from_id = getFromId(); ret.to_id = new TLRPC.TL_peerUser(); - ret.to_id.user_id = mrMsg.getToId(); - ret.date = (int)mrMsg.getTimestamp(); - ret.dialog_id = mrMsg.getChatId(); + ret.to_id.user_id = getToId(); + ret.date = (int)getTimestamp(); + ret.dialog_id = getChatId(); 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 @@ -137,16 +137,16 @@ public class MrMsg { ret.created_by_mr = true; if( type == MR_MSG_TEXT ) { - ret.message = mrMsg.getText(); + ret.message = getText(); } else if( type == MR_MSG_IMAGE ) { - String path = mrMsg.getParam('f', ""); + String path = getParam('f', ""); TLRPC.TL_photo photo = null; if( !path.isEmpty() ) { try { TLRPC.TL_photoSize photoSize = new TLRPC.TL_photoSize(); - photoSize.w = mrMsg.getParamInt('w', 800); - photoSize.h = mrMsg.getParamInt('h', 800); + photoSize.w = getParamInt('w', 800); + photoSize.h = getParamInt('h', 800); photoSize.size = 0; photoSize.location = new TLRPC.TL_fileLocation(); photoSize.location.mr_path = path; @@ -170,7 +170,7 @@ public class MrMsg { } } else if( type == MR_MSG_AUDIO || type == MR_MSG_VIDEO ) { - String path = mrMsg.getParam('f', ""); + String path = getParam('f', ""); if( !path.isEmpty()) { ret.message = "-1"; // may be misused for video editing information ret.media = new TLRPC.TL_messageMediaDocument(); @@ -180,14 +180,14 @@ public class MrMsg { if( type == MR_MSG_AUDIO ) { TLRPC.TL_documentAttributeAudio attr = new TLRPC.TL_documentAttributeAudio(); attr.voice = true; // !voice = music - attr.duration = mrMsg.getParamInt('d', 0) / 1000; + attr.duration = getParamInt('d', 0) / 1000; ret.media.document.attributes.add(attr); } else if( type == MR_MSG_VIDEO) { TLRPC.TL_documentAttributeVideo attr = new TLRPC.TL_documentAttributeVideo(); - attr.duration = mrMsg.getParamInt('d', 0) / 1000; - attr.w = mrMsg.getParamInt('w', 0); - attr.h = mrMsg.getParamInt('h', 0); + attr.duration = getParamInt('d', 0) / 1000; + attr.w = getParamInt('w', 0); + attr.h = getParamInt('h', 0); ret.media.document.attributes.add(attr); } diff --git a/MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java b/MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java index 1d0bfc2ce..1da00ffbc 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java @@ -794,7 +794,7 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter // SEND MESSAGE // ------------------------------------------------------------------------------------- - MrChat mrChat = MrMailbox.getChat(MrMailbox.hMailbox, (int)peer); + MrChat mrChat = MrMailbox.getChat((int)peer); if (type == 0 /*|| type == 9 && message != null && encryptedChat != null*/ ) { diff --git a/MessengerProj/src/main/java/com/b44t/messenger/UserConfig.java b/MessengerProj/src/main/java/com/b44t/messenger/UserConfig.java index 69388aabb..35b0119ed 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/UserConfig.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/UserConfig.java @@ -138,7 +138,7 @@ public class UserConfig { public static TLRPC.User getCurrentUser() { synchronized (sync) { if( currentUser==null ) { - currentUser = MrMailbox.contactId2user(1); + currentUser = MrContact.contactId2user(1); } return currentUser; } @@ -146,7 +146,7 @@ public class UserConfig { public static void setCurrentUser(TLRPC.User user) { synchronized (sync) { - currentUser = MrMailbox.contactId2user(1); // EDIT BY MR - force the current user to be user #1, normally this function should not be called at all + currentUser = MrContact.contactId2user(1); // EDIT BY MR - force the current user to be user #1, normally this function should not be called at all } } diff --git a/MessengerProj/src/main/java/com/b44t/messenger/query/DraftQuery.java b/MessengerProj/src/main/java/com/b44t/messenger/query/DraftQuery.java index 5c3824867..40e85d644 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/query/DraftQuery.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/query/DraftQuery.java @@ -61,7 +61,7 @@ public class DraftQuery { } public static TLRPC.DraftMessage getDraft(long did) { // returns null for "no draft" - MrChat mrChat = MrMailbox.getChat(MrMailbox.hMailbox, (int)did); + MrChat mrChat = MrMailbox.getChat((int)did); if( mrChat.getId() == 0 ) { return null; } @@ -73,7 +73,7 @@ public class DraftQuery { } public static TLRPC.Message getDraftMessage(long did) { // returns null for "no draft" - MrChat mrChat = MrMailbox.getChat(MrMailbox.hMailbox, (int)did); + MrChat mrChat = MrMailbox.getChat((int)did); if( mrChat.getId() == 0 ) { return null; } @@ -86,7 +86,7 @@ public class DraftQuery { private static void saveDraft__(long did, String message, long replyToMessageId) // message may be null { - MrChat mrChat = MrMailbox.getChat(MrMailbox.hMailbox, (int)did); + MrChat mrChat = MrMailbox.getChat((int)did); mrChat.setDraft(message, replyToMessageId); } diff --git a/MessengerProj/src/main/java/com/b44t/messenger/query/SharedMediaQuery.java b/MessengerProj/src/main/java/com/b44t/messenger/query/SharedMediaQuery.java index b91b4e2c1..ba205e0a6 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/query/SharedMediaQuery.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/query/SharedMediaQuery.java @@ -80,7 +80,7 @@ public class SharedMediaQuery { int[] media = new int[0]; if( type == SharedMediaQuery.MEDIA_PHOTOVIDEO ) { - media = MrMailbox.MrMailboxGetChatMedia(MrMailbox.hMailbox, (int)uid, MrMsg.MR_MSG_IMAGE, MrMsg.MR_MSG_VIDEO); + media = MrMailbox.getChatMedia((int)uid, MrMsg.MR_MSG_IMAGE, MrMsg.MR_MSG_VIDEO); } NotificationCenter.getInstance().postNotificationName(NotificationCenter.mediaCountDidLoaded, diff --git a/MessengerProj/src/main/java/com/b44t/ui/AccountSettingsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/AccountSettingsActivity.java index cd9417054..104dfe046 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/AccountSettingsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/AccountSettingsActivity.java @@ -199,52 +199,52 @@ public class AccountSettingsActivity extends BaseFragment { if( addrCell!=null) { v = addrCell.getValue().trim(); - MrMailbox.MrMailboxSetConfig(MrMailbox.hMailbox, "addr", v.isEmpty() ? null : v); + MrMailbox.setConfig("addr", v.isEmpty() ? null : v); } if( mailPwCell!=null) { v = mailPwCell.getValue().trim(); - MrMailbox.MrMailboxSetConfig(MrMailbox.hMailbox, "mail_pw", v.isEmpty() ? null : v); + MrMailbox.setConfig("mail_pw", v.isEmpty() ? null : v); } if( mailServerCell!=null) { v = mailServerCell.getValue().trim(); - MrMailbox.MrMailboxSetConfig(MrMailbox.hMailbox, "mail_server", v.isEmpty() ? null : v); + MrMailbox.setConfig("mail_server", v.isEmpty() ? null : v); } if( mailPortCell!=null ) { v = mailPortCell.getValue().trim(); - MrMailbox.MrMailboxSetConfig(MrMailbox.hMailbox, "mail_port", v.isEmpty() ? null : v); + MrMailbox.setConfig("mail_port", v.isEmpty() ? null : v); } if( mailUserCell!=null) { v = mailUserCell.getValue().trim(); - MrMailbox.MrMailboxSetConfig(MrMailbox.hMailbox, "mail_user", v.isEmpty() ? null : v); + MrMailbox.setConfig("mail_user", v.isEmpty() ? null : v); } if( sendServerCell!=null ) { v = sendServerCell.getValue().trim(); - MrMailbox.MrMailboxSetConfig(MrMailbox.hMailbox, "send_server", v.isEmpty() ? null : v); + MrMailbox.setConfig("send_server", v.isEmpty() ? null : v); } if( sendPortCell!=null ) { v = sendPortCell.getValue().trim(); - MrMailbox.MrMailboxSetConfig(MrMailbox.hMailbox, "send_port", v.isEmpty() ? null : v); + MrMailbox.setConfig("send_port", v.isEmpty() ? null : v); } if(sendUserCell!=null) { v = sendUserCell.getValue().trim(); - MrMailbox.MrMailboxSetConfig(MrMailbox.hMailbox, "send_user", v.isEmpty() ? null : v); + MrMailbox.setConfig("send_user", v.isEmpty() ? null : v); } if( sendPwCell!=null ) { v = sendPwCell.getValue().trim(); - MrMailbox.MrMailboxSetConfig(MrMailbox.hMailbox, "send_pw", v.isEmpty() ? null : v); + MrMailbox.setConfig("send_pw", v.isEmpty() ? null : v); } - MrMailbox.MrMailboxDisconnect(MrMailbox.hMailbox); - MrMailbox.MrMailboxConfigure(MrMailbox.hMailbox); - MrMailbox.MrMailboxConnect(MrMailbox.hMailbox); + MrMailbox.disconnect(); + MrMailbox.configure(); + MrMailbox.connect(); // show dialog @@ -336,7 +336,7 @@ public class AccountSettingsActivity extends BaseFragment { if (i == rowAddr) { if( addrCell==null) { addrCell = new MrEditTextCell(mContext); - addrCell.setValueHintAndLabel(MrMailbox.MrMailboxGetConfig(MrMailbox.hMailbox, "addr", ""), + addrCell.setValueHintAndLabel(MrMailbox.getConfig("addr", ""), "", LocaleController.getString("MyEmailAddress", R.string.MyEmailAddress), false); addrCell.getEditTextView().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS); } @@ -345,7 +345,7 @@ public class AccountSettingsActivity extends BaseFragment { else if (i == rowMailPw) { if( mailPwCell==null) { mailPwCell = new MrEditTextCell(mContext); - mailPwCell.setValueHintAndLabel(MrMailbox.MrMailboxGetConfig(MrMailbox.hMailbox, "mail_pw", ""), + mailPwCell.setValueHintAndLabel(MrMailbox.getConfig("mail_pw", ""), "", LocaleController.getString("Password", R.string.Password), false); mailPwCell.getEditTextView().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_TEXT_VARIATION_PASSWORD); } @@ -354,7 +354,7 @@ public class AccountSettingsActivity extends BaseFragment { else if (i == rowMailServer) { if( mailServerCell==null) { mailServerCell = new MrEditTextCell(mContext); - mailServerCell.setValueHintAndLabel(MrMailbox.MrMailboxGetConfig(MrMailbox.hMailbox, "mail_server", ""), + mailServerCell.setValueHintAndLabel(MrMailbox.getConfig("mail_server", ""), LocaleController.getString("Automatic", R.string.Automatic), LocaleController.getString("ImapServer", R.string.ImapServer), false); } view = mailServerCell; @@ -362,7 +362,7 @@ public class AccountSettingsActivity extends BaseFragment { else if (i == rowMailPort) { if( mailPortCell==null) { mailPortCell = new MrEditTextCell(mContext); - mailPortCell.setValueHintAndLabel(MrMailbox.MrMailboxGetConfig(MrMailbox.hMailbox, "mail_port", ""), + mailPortCell.setValueHintAndLabel(MrMailbox.getConfig("mail_port", ""), LocaleController.getString("Default", R.string.Default), LocaleController.getString("ImapPort", R.string.ImapPort), false); } view = mailPortCell; @@ -370,7 +370,7 @@ public class AccountSettingsActivity extends BaseFragment { else if (i == rowMailUser) { if( mailUserCell==null) { mailUserCell = new MrEditTextCell(mContext); - mailUserCell.setValueHintAndLabel(MrMailbox.MrMailboxGetConfig(MrMailbox.hMailbox, "mail_user", ""), + mailUserCell.setValueHintAndLabel(MrMailbox.getConfig("mail_user", ""), LocaleController.getString("FromAbove", R.string.FromAbove), LocaleController.getString("ImapLoginname", R.string.ImapLoginname), false); } view = mailUserCell; @@ -378,7 +378,7 @@ public class AccountSettingsActivity extends BaseFragment { else if (i == rowSendServer) { if( sendServerCell==null) { sendServerCell = new MrEditTextCell(mContext); - sendServerCell.setValueHintAndLabel(MrMailbox.MrMailboxGetConfig(MrMailbox.hMailbox, "send_server", ""), + sendServerCell.setValueHintAndLabel(MrMailbox.getConfig("send_server", ""), LocaleController.getString("Automatic", R.string.Automatic), LocaleController.getString("SmtpServer", R.string.SmtpServer), false); } view = sendServerCell; @@ -386,7 +386,7 @@ public class AccountSettingsActivity extends BaseFragment { else if (i == rowSendPort) { if( sendPortCell==null) { sendPortCell = new MrEditTextCell(mContext); - sendPortCell.setValueHintAndLabel(MrMailbox.MrMailboxGetConfig(MrMailbox.hMailbox, "send_port", ""), + sendPortCell.setValueHintAndLabel(MrMailbox.getConfig("send_port", ""), LocaleController.getString("Default", R.string.Default), LocaleController.getString("SmtpPort", R.string.SmtpPort), false); } view = sendPortCell; @@ -394,7 +394,7 @@ public class AccountSettingsActivity extends BaseFragment { else if (i == rowSendUser) { if( sendUserCell==null) { sendUserCell = new MrEditTextCell(mContext); - sendUserCell.setValueHintAndLabel(MrMailbox.MrMailboxGetConfig(MrMailbox.hMailbox, "send_user", ""), + sendUserCell.setValueHintAndLabel(MrMailbox.getConfig("send_user", ""), LocaleController.getString("FromAbove", R.string.FromAbove), LocaleController.getString("SmtpLoginname", R.string.SmtpLoginname), false); } view = sendUserCell; @@ -402,7 +402,7 @@ public class AccountSettingsActivity extends BaseFragment { else if (i == rowSendPw) { if( sendPwCell==null) { sendPwCell = new MrEditTextCell(mContext); - sendPwCell.setValueHintAndLabel(MrMailbox.MrMailboxGetConfig(MrMailbox.hMailbox, "send_pw", ""), + sendPwCell.setValueHintAndLabel(MrMailbox.getConfig("send_pw", ""), LocaleController.getString("FromAbove", R.string.FromAbove), LocaleController.getString("SmtpPassword", R.string.SmtpPassword), false); sendPwCell.getEditTextView().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_TEXT_VARIATION_PASSWORD); } diff --git a/MessengerProj/src/main/java/com/b44t/ui/Adapters/ContactsAdapter.java b/MessengerProj/src/main/java/com/b44t/ui/Adapters/ContactsAdapter.java index bbf58d9bc..1b23c0ee2 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Adapters/ContactsAdapter.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Adapters/ContactsAdapter.java @@ -32,7 +32,7 @@ public class ContactsAdapter extends BaseFragmentAdapter { public ContactsAdapter(Context context) { mContext = context; - contactIds = MrMailbox.MrMailboxGetKnownContacts(MrMailbox.hMailbox, null); + contactIds = MrMailbox.getKnownContacts(null); } public void setCheckedMap(HashMap map) { @@ -44,12 +44,12 @@ public class ContactsAdapter extends BaseFragmentAdapter { } public void search(String query) { - contactIds = MrMailbox.MrMailboxGetKnownContacts(MrMailbox.hMailbox, query); + contactIds = MrMailbox.getKnownContacts(query); lastQuery = query; } public void searchAgain() { - contactIds = MrMailbox.MrMailboxGetKnownContacts(MrMailbox.hMailbox, lastQuery); + contactIds = MrMailbox.getKnownContacts(lastQuery); } @Override @@ -81,7 +81,7 @@ public class ContactsAdapter extends BaseFragmentAdapter { if(curr_user_index>=0 && curr_user_index=0 && i ids = new ArrayList<>(selectedMessagesIds[0].keySet()); - String info_str = MrMailbox.MrMailboxGetMsgInfo(MrMailbox.hMailbox, ids.get(0)); + String info_str = MrMailbox.getMsgInfo(ids.get(0)); AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity()); builder.setMessage(info_str); @@ -828,7 +828,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not boolean isChatWithDeaddrop = m_mrChat.getId()==MrChat.MR_CHAT_ID_DEADDROP; m_canMute = true; - if( isChatWithDeaddrop && MrMailbox.MrMailboxGetConfigInt(MrMailbox.hMailbox, "show_deaddrop", 0)==0 ) { + if( isChatWithDeaddrop && MrMailbox.getConfigInt("show_deaddrop", 0)==0 ) { m_canMute = false; } @@ -2856,10 +2856,10 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not chatActivityEnterView.closeKeyboard(); } - MrMsg mrMsg = MrMailbox.getMsg(MrMailbox.hMailbox, messageId); + MrMsg mrMsg = MrMailbox.getMsg(messageId); final int fromId =mrMsg.getFromId(); - MrContact mrContact = MrMailbox.getContact(MrMailbox.hMailbox, fromId); + MrContact mrContact = MrMailbox.getContact(fromId); String name = mrContact.getNameNAddr(); @@ -2867,7 +2867,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogInterface, int i) { - int chatId = MrMailbox.MrMailboxCreateChatByContactId(MrMailbox.hMailbox, fromId); + int chatId = MrMailbox.createChatByContactId(fromId); if( chatId != 0 ) { Bundle args = new Bundle(); args.putInt("chat_id", (int)chatId); @@ -3631,12 +3631,12 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not } */ { - int[] msglist = MrMailbox.MrMailboxGetChatMsgs(MrMailbox.hMailbox, (int)dialog_id); + int[] msglist = MrMailbox.getChatMsgs((int)dialog_id); int mrCount = msglist.length; for (int a = mrCount - 1; a >= 0; a--) { - MrMsg mrMsg = MrMailbox.getMsg(MrMailbox.hMailbox, msglist[a]); - TLRPC.Message msg = MrMsg.MrMsg2Message(mrMsg); + MrMsg mrMsg = MrMailbox.getMsg(msglist[a]); + TLRPC.Message msg = mrMsg.get_TLRPC_Message(); MessageObject msgDrawObj = new MessageObject(msg, null, true); messages.add(0, msgDrawObj); messagesDict[loadIndex].put(msg.id, msgDrawObj); @@ -3959,7 +3959,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not } }*/ int back_id = m_mrChat.getId(); - m_mrChat = MrMailbox.getChat(MrMailbox.hMailbox, back_id); + m_mrChat = MrMailbox.getChat(back_id); updateTitle(); } @@ -4268,7 +4268,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not } } else if (id == NotificationCenter.messagesSentOrRead) { int back_id = m_mrChat.getId(); - m_mrChat = MrMailbox.getChat(MrMailbox.hMailbox, back_id); + m_mrChat = MrMailbox.getChat(back_id); int evt_read = (int)args[0]; int evt_chat_id = (int)args[1]; @@ -5251,7 +5251,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not for (HashMap.Entry entry : selectedMessagesIds[a].entrySet()) { MessageObject msg = entry.getValue(); int id_to_del = msg.messageOwner.id; - MrMailbox.MrMailboxDeleteMsg(MrMailbox.hMailbox, id_to_del); + MrMailbox.deleteMsg(id_to_del); } NotificationCenter.getInstance().postNotificationName(NotificationCenter.messagesDeleted, ids, 0); } @@ -5458,7 +5458,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not String str = ""; if (name) { if (previousUid != messageObject.messageOwner.from_id) { - MrContact mrContact = MrMailbox.getContact(MrMailbox.hMailbox, messageObject.messageOwner.from_id); + MrContact mrContact = MrMailbox.getContact(messageObject.messageOwner.from_id); str += mrContact.getDisplayName() + ":\n"; } } diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatAvatarContainer.java b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatAvatarContainer.java index ae9255953..f2895bf6e 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatAvatarContainer.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatAvatarContainer.java @@ -64,7 +64,7 @@ public class ChatAvatarContainer extends FrameLayout { args.putInt("chat_id", parentFragment.m_mrChat.getId()); } else { - int[] contact_ids = MrMailbox.MrMailboxGetChatContacts(MrMailbox.hMailbox, parentFragment.m_mrChat.getId()); + int[] contact_ids = MrMailbox.getChatContacts(parentFragment.m_mrChat.getId()); if( contact_ids.length==0) { return; // should not happen } diff --git a/MessengerProj/src/main/java/com/b44t/ui/ContactAddActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ContactAddActivity.java index db02025da..a891fe9b8 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ContactAddActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ContactAddActivity.java @@ -104,7 +104,7 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent actionBar.setTitle(LocaleController.getString("NewContactTitle", R.string.NewContactTitle)); } else { actionBar.setTitle(LocaleController.getString("EditName", R.string.EditName)); - MrContact mrContact = MrMailbox.getContact(MrMailbox.hMailbox, user_id); + MrContact mrContact = MrMailbox.getContact(user_id); nameToSet = mrContact.getDisplayName(); } @@ -120,18 +120,18 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent addr = emailTextView.getText().toString(); } else { - MrContact mrContact = MrMailbox.getContact(MrMailbox.hMailbox, user_id); + MrContact mrContact = MrMailbox.getContact(user_id); addr = mrContact.getAddr(); } int new_user_id; - if( (new_user_id=MrMailbox.MrMailboxCreateContact(MrMailbox.hMailbox, name, addr))==0 ) { + if( (new_user_id=MrMailbox.createContact(name, addr))==0 ) { Toast.makeText(getParentActivity(), LocaleController.getString("BadEmailAddress", R.string.BadEmailAddress), Toast.LENGTH_LONG).show(); return; } else if (do_what==CREATE_CONTACT) { if(create_chat_when_done) { - int belonging_chat_id = MrMailbox.MrMailboxCreateChatByContactId(MrMailbox.hMailbox, new_user_id); + int belonging_chat_id = MrMailbox.createChatByContactId(new_user_id); if( belonging_chat_id != 0 ) { Bundle args = new Bundle(); args.putInt("chat_id", belonging_chat_id); diff --git a/MessengerProj/src/main/java/com/b44t/ui/ContactsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ContactsActivity.java index 1465855dd..e9b364ce9 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ContactsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ContactsActivity.java @@ -180,7 +180,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter String pbcontacts = ContactsController.getInstance().readContactsFromPhoneBook(); if (!pbcontacts.isEmpty()) { - if (MrMailbox.MrMailboxAddAddressBook(MrMailbox.hMailbox, pbcontacts) > 0) { + if (MrMailbox.addAddressBook(pbcontacts) > 0) { AndroidUtilities.runOnUIThread(new Runnable() { @Override public void run() { @@ -402,7 +402,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter if (item instanceof TLRPC.User) { final TLRPC.User user = (TLRPC.User) item; if( do_what == SELECT_CONTACT_FOR_NEW_CHAT ) { - int belonging_chat_id = MrMailbox.MrMailboxGetChatIdByContactId(MrMailbox.hMailbox, user.id); + int belonging_chat_id = MrMailbox.getChatIdByContactId(user.id); if( belonging_chat_id!=0 ) { Bundle args = new Bundle(); args.putInt("chat_id", belonging_chat_id); @@ -412,7 +412,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter String name = ""; { - MrContact mrContact = MrMailbox.getContact(MrMailbox.hMailbox, user.id); + MrContact mrContact = MrMailbox.getContact(user.id); name = mrContact.getNameNAddr(); } @@ -420,7 +420,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogInterface, int i) { - int belonging_chat_id = MrMailbox.MrMailboxCreateChatByContactId(MrMailbox.hMailbox, user.id); + int belonging_chat_id = MrMailbox.createChatByContactId(user.id); if( belonging_chat_id != 0 ) { Bundle args = new Bundle(); args.putInt("chat_id", belonging_chat_id); @@ -594,7 +594,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter String name =""; { - MrContact mrContact = MrMailbox.getContact(MrMailbox.hMailbox, user.id); + MrContact mrContact = MrMailbox.getContact(user.id); name = mrContact.getDisplayName(); } diff --git a/MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java b/MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java index 3ba4bbbea..b915ae0f5 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java @@ -435,7 +435,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati int curr_user_id = selectedContacts.get(i); - MrContact mrContact = MrMailbox.getContact(MrMailbox.hMailbox, curr_user_id); + MrContact mrContact = MrMailbox.getContact(curr_user_id); ((UserCell) view).setData(curr_user_id, 0, mrContact.getDisplayName(), mrContact.getAddr(), 0); diff --git a/MessengerProj/src/main/java/com/b44t/ui/NameSettingsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/NameSettingsActivity.java index 71dae1889..9733ef19e 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/NameSettingsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/NameSettingsActivity.java @@ -153,7 +153,7 @@ public class NameSettingsActivity extends BaseFragment { if( v.length()>=1 && v.charAt(0)=='.') { String cmd = v.substring(1); - String execute_result = MrMailbox.MrMailboxExecute(MrMailbox.hMailbox, cmd); + String execute_result = MrMailbox.execute(cmd); if( execute_result==null || execute_result.isEmpty()) { execute_result = "ERROR: Unknown command."; } @@ -168,7 +168,7 @@ public class NameSettingsActivity extends BaseFragment { return; } - MrMailbox.MrMailboxSetConfig(MrMailbox.hMailbox, "displayname", v.isEmpty() ? null : v); + MrMailbox.setConfig("displayname", v.isEmpty() ? null : v); } NotificationCenter.getInstance().postNotificationName(NotificationCenter.mainUserInfoChanged); @@ -245,7 +245,7 @@ public class NameSettingsActivity extends BaseFragment { if (i == rowDisplayname) { if(displaynameCell==null) { displaynameCell = new MrEditTextCell(mContext); - displaynameCell.setValueHintAndLabel(MrMailbox.MrMailboxGetConfig(MrMailbox.hMailbox, "displayname", ""), + displaynameCell.setValueHintAndLabel(MrMailbox.getConfig("displayname", ""), "", "", true); } view = displaynameCell; diff --git a/MessengerProj/src/main/java/com/b44t/ui/PhotoViewer.java b/MessengerProj/src/main/java/com/b44t/ui/PhotoViewer.java index c87de4811..560563f24 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/PhotoViewer.java +++ b/MessengerProj/src/main/java/com/b44t/ui/PhotoViewer.java @@ -2702,7 +2702,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat if( currentMessageObject!=null && currentMessageObject.messageOwner!=null ) { - MrContact mrContact = MrMailbox.getContact(MrMailbox.hMailbox, currentMessageObject.messageOwner.from_id); + MrContact mrContact = MrMailbox.getContact(currentMessageObject.messageOwner.from_id); nameTextView.setText(mrContact.getDisplayName()); } diff --git a/MessengerProj/src/main/java/com/b44t/ui/PrivacySettingsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/PrivacySettingsActivity.java index f051f43a1..498e12b1c 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/PrivacySettingsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/PrivacySettingsActivity.java @@ -114,12 +114,12 @@ public class PrivacySettingsActivity extends BaseFragment implements Notificatio presentFragment(new PasscodeActivity(0)); } } else if( i==showUnknownSendersRow) { - int oldval = MrMailbox.MrMailboxGetConfigInt(MrMailbox.hMailbox, "show_deaddrop", 0); + int oldval = MrMailbox.getConfigInt("show_deaddrop", 0); if( oldval == 1 ) { - MrMailbox.MrMailboxSetConfig(MrMailbox.hMailbox, "show_deaddrop", "0"); + MrMailbox.setConfig("show_deaddrop", "0"); } else { - MrMailbox.MrMailboxSetConfig(MrMailbox.hMailbox, "show_deaddrop", "1"); + MrMailbox.setConfig("show_deaddrop", "1"); } MrMailbox.MrCallback(MrMailbox.MR_EVENT_MSGS_UPDATED, 0, 0); if (view instanceof TextCheckCell) { @@ -285,7 +285,7 @@ public class PrivacySettingsActivity extends BaseFragment implements Notificatio TextCheckCell textCell = (TextCheckCell) view; if( i==showUnknownSendersRow) { textCell.setTextAndCheck(LocaleController.getString("DeaddropInChatlist", R.string.DeaddropInChatlist), - MrMailbox.MrMailboxGetConfigInt(MrMailbox.hMailbox, "show_deaddrop", 0)!=0, true); + MrMailbox.getConfigInt("show_deaddrop", 0)!=0, true); } } return view; diff --git a/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java index 50a5b6329..3327a0242 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java @@ -190,7 +190,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. } else if (chat_id != 0) { - sortedUserIds = MrMailbox.MrMailboxGetChatContacts(MrMailbox.hMailbox, chat_id); + sortedUserIds = MrMailbox.getChatContacts(chat_id); avatarUpdater = new AvatarUpdater(); avatarUpdater.delegate = new AvatarUpdater.AvatarUpdaterDelegate() { @@ -265,7 +265,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. finishFragment(); } else if (id == block_contact) { if( userBlocked() ) { - MrMailbox.MrMailboxBlockContact(MrMailbox.hMailbox, user_id, 0); + MrMailbox.blockContact(user_id, 0); finishFragment(); /* got to the parent, this is important eg. when editing blocking in the BlockedUserActivitiy. Moreover, this saves us updating all the states in the profile */ } else { @@ -274,7 +274,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogInterface, int i) { - MrMailbox.MrMailboxBlockContact(MrMailbox.hMailbox, user_id, 1); + MrMailbox.blockContact(user_id, 1); finishFragment(); /* got to the parent, this is important eg. when editing blocking in the BlockedUserActivitiy. Moreover, this saves us updating all the states in the profile */ } }); @@ -287,7 +287,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogInterface, int i) { - if( MrMailbox.MrMailboxDeleteContact(MrMailbox.hMailbox, user_id)==0 ) { + if( MrMailbox.deleteContact(user_id)==0 ) { Toast.makeText(getParentActivity(), LocaleController.getString("CannotDeleteContact", R.string.CannotDeleteContact), Toast.LENGTH_LONG).show(); } else { @@ -326,7 +326,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. try { int install_chat_id = chat_id; if (install_chat_id == 0) { - install_chat_id = MrMailbox.MrMailboxGetChatIdByContactId(MrMailbox.hMailbox, user_id); + install_chat_id = MrMailbox.getChatIdByContactId(user_id); } AndroidUtilities.installShortcut(install_chat_id); Toast.makeText(getParentActivity(), LocaleController.getString("ShortcutAdded", R.string.ShortcutAdded), Toast.LENGTH_LONG).show(); @@ -403,7 +403,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. presentFragment(new ContactAddActivity(args)); } else if(position==startChatRow) { - int belonging_chat_id = MrMailbox.MrMailboxGetChatIdByContactId(MrMailbox.hMailbox, user_id); + int belonging_chat_id = MrMailbox.getChatIdByContactId(user_id); if( belonging_chat_id != 0 ) { Bundle args = new Bundle(); args.putInt("chat_id", belonging_chat_id); @@ -415,7 +415,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. String name = ""; { - MrContact mrContact = MrMailbox.getContact(MrMailbox.hMailbox, user_id); + MrContact mrContact = MrMailbox.getContact(user_id); name = mrContact.getNameNAddr(); } @@ -423,7 +423,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogInterface, int i) { - int belonging_chat_id = MrMailbox.MrMailboxCreateChatByContactId(MrMailbox.hMailbox, user_id); + int belonging_chat_id = MrMailbox.createChatByContactId(user_id); if( belonging_chat_id != 0 ) { Bundle args = new Bundle(); args.putInt("chat_id", belonging_chat_id); @@ -539,7 +539,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. PhotoViewer.getInstance().openPhoto(user.photo.photo_big, ProfileActivity.this); } } else if (chat_id != 0) { - TLRPC.Chat chat = MrMailbox.chatId2chat(chat_id); + TLRPC.Chat chat = MrChat.chatId2chat(chat_id); if (chat.photo != null && chat.photo.photo_big != null) { PhotoViewer.getInstance().setParentActivity(getParentActivity()); PhotoViewer.getInstance().openPhoto(chat.photo.photo_big, ProfileActivity.this); @@ -602,7 +602,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. } AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity()); CharSequence[] items; - TLRPC.Chat chat = MrMailbox.chatId2chat(chat_id); + TLRPC.Chat chat = MrChat.chatId2chat(chat_id); if (chat.photo == null || chat.photo.photo_big == null /*|| chat.photo instanceof TLRPC.TL_chatPhotoEmpty*/) { items = new CharSequence[]{LocaleController.getString("FromCamera", R.string.FromCamera), LocaleController.getString("FromGalley", R.string.FromGalley)}; } else { @@ -1099,7 +1099,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. photoBig = user.photo.photo_big; } } else if (chat_id != 0) { - TLRPC.Chat chat = MrMailbox.chatId2chat(chat_id); + TLRPC.Chat chat = MrChat.chatId2chat(chat_id); if (chat != null && chat.photo != null && chat.photo.photo_big != null) { photoBig = chat.photo.photo_big; } @@ -1194,7 +1194,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. { boolean blocked = false; if( user_id!=0 ) { - MrContact mrContact = MrMailbox.getContact(MrMailbox.hMailbox, user_id); + MrContact mrContact = MrMailbox.getContact(user_id); blocked = mrContact.isBlocked()!=0; } return blocked; @@ -1219,12 +1219,12 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. String newString2; if( user_id!=0 ) { - MrContact mrContact = MrMailbox.getContact(MrMailbox.hMailbox, user_id); + MrContact mrContact = MrMailbox.getContact(user_id); newString = mrContact.getDisplayName(); newString2 = mrContact.getAddr(); } else { - MrChat mrChat = MrMailbox.getChat(MrMailbox.hMailbox, chat_id); + MrChat mrChat = MrMailbox.getChat(chat_id); newString = mrChat.getName(); newString2 = mrChat.getSubtitle(); } @@ -1262,7 +1262,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. ActionBarMenuItem item = menu.addItem(10, R.drawable.ic_ab_other); - if( chat_id!=0 || MrMailbox.MrMailboxGetChatIdByContactId(MrMailbox.hMailbox, user_id)!=0 ) { + if( chat_id!=0 || MrMailbox.getChatIdByContactId(user_id)!=0 ) { item.addSubItem(add_shortcut, LocaleController.getString("AddShortcut", R.string.AddShortcut), 0); } @@ -1410,7 +1410,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. int curr_user_index = i - firstMemberRow; if(curr_user_index>=0 && curr_user_index