awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Add contact list.

Browse Source
This commit is contained in:
B. Petersen
2016-10-03 13:35:58 +02:00
parent 1eaf64f46a
commit 8ad1809b65
4 changed files with 49 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TMessagesProj/jni/Android.mk
+1
View File
@@ -1609,6 +1609,7 @@ LOCAL_SRC_FILES += \
../../../messenger-backend/src/mrchat.c \
../../../messenger-backend/src/mrchatlist.c \
../../../messenger-backend/src/mrcontact.c \
../../../messenger-backend/src/mrcontactlist.c \
../../../messenger-backend/src/mrimap.c \
../../../messenger-backend/src/mrimfparser.c \
../../../messenger-backend/src/mrlog.c \
TMessagesProj/jni/mr_wrapper.c
+2 -8
View File
@@ -94,15 +94,9 @@ JNIEXPORT jint Java_org_telegram_messenger_MrMailbox_MrMailboxFetch(JNIEnv *env,
/* MrMailbox - handle contacts */
JNIEXPORT jint Java_org_telegram_messenger_MrMailbox_MrMailboxGetContactCnt(JNIEnv *env, jclass c, jlong hMailbox)
JNIEXPORT jlong Java_org_telegram_messenger_MrMailbox_MrMailboxGetContactById(JNIEnv *env, jclass c, long hMailbox, jint id)
{
return (jint)mrmailbox_get_contact_cnt((mrmailbox_t*)hMailbox);
}
JNIEXPORT jlong Java_org_telegram_messenger_MrMailbox_MrMailboxGetContactByIndex(JNIEnv *env, jclass c, long hMailbox, jint i)
{
return (jlong)mrmailbox_get_contact_by_index((mrmailbox_t*)hMailbox, i);
return (jlong)mrmailbox_get_contact_by_id((mrmailbox_t*)hMailbox, id);
}
TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java
+1 -3
View File
@@ -58,14 +58,12 @@ public class MrMailbox {
// MrMailbox objects
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 MrMailboxConnect (long hMailbox);
public native static void MrMailboxDisconnect (long hMailbox);
public native static int MrMailboxFetch (long hMailbox);
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 MrMailboxGetContactById (long hMailbox);// returns hContact 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
TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
+45 -5
View File
@@ -600,8 +600,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
int loadIndex = 0;
NotificationCenter.getInstance().postNotificationName(
NotificationCenter.messagesDidLoaded, // this is a synchronous call -- however, this should not make much difference
dialog_id, count, objects, isCache, first_unread_final, last_message_id, unread_count,
last_date, load_type, isEnd, classGuid, loadIndex);
dialog_id, count, objects /*arg#2*/, isCache, first_unread_final, last_message_id, unread_count,
last_date, load_type, isEnd, classGuid /*arg#10*/, loadIndex);
}
// /EDIT BY MR
@@ -1296,11 +1296,13 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (currentEncryptedChat == null) {
TextView emptyView = new TextView(context);
/* EDIT BY MR
if (currentUser != null && currentUser.id != 777000 && currentUser.id != 429000 && (currentUser.id / 1000 == 333 || currentUser.id % 1000 == 0)) {
emptyView.setText(LocaleController.getString("GotAQuestion", R.string.GotAQuestion));
} else {
*/
emptyView.setText(LocaleController.getString("NoMessages", R.string.NoMessages));
}
//} EDIT BY MR
emptyView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
emptyView.setGravity(Gravity.CENTER);
emptyView.setTextColor(Theme.CHAT_EMPTY_VIEW_TEXT_COLOR);
@@ -4609,10 +4611,14 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (id == NotificationCenter.messagesDidLoaded) {
int guid = (Integer) args[10];
if (guid == classGuid) {
// define the animations that we want to receive during the opening animation -- EDIT BY MR
if (!openAnimationEnded) {
NotificationCenter.getInstance().setAllowedNotificationsDutingAnimation(new int[]{NotificationCenter.chatInfoDidLoaded, NotificationCenter.dialogsNeedReload,
NotificationCenter.closeChats, NotificationCenter.botKeyboardDidLoaded/*, NotificationCenter.botInfoDidLoaded*/});
}
/* EDIT BY MR -- not sure what this is for
int queryLoadIndex = (Integer) args[11];
int index = waitingForLoad.indexOf(queryLoadIndex);
if (index == -1) {
@@ -4620,7 +4626,14 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} else {
waitingForLoad.remove(index);
}
*/
/* EDIT BY MR -- messArr are the message objects to show
ArrayList<MessageObject> messArr = (ArrayList<MessageObject>) args[2];
*/
/* EDIT BY MR -- scroll to a specific message
if (waitingForReplyMessageLoad) {
boolean found = false;
for (int a = 0; a < messArr.size(); a++) {
@@ -4639,6 +4652,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
startLoadFromMessageId = startLoadFrom;
needSelectFromMessageId = needSelect;
}
*/
loadsCount++;
long did = (Long) args[0];
@@ -4665,9 +4679,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
minMessageId[0] = 0;
}
/* EDIT BY MR
if (loadsCount == 1 && messArr.size() > 20) {
loadsCount++;
}
*/
if (firstLoading) {
if (!forwardEndReached[loadIndex]) {
@@ -4697,29 +4713,43 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
});
}
/* EDIT BY MR
if (load_type == 1) {
Collections.reverse(messArr);
}
if (currentEncryptedChat == null) {
MessagesQuery.loadReplyMessagesForMessages(messArr, dialog_id);
}
*/
int approximateHeightSum = 0;
for (int a = 0; a < messArr.size(); a++) { // -------- add loop ------------
int mrCount = MrMailbox.MrMsglistGetCnt(m_hMsglist);
for (int a = 0; a < mrCount /*EDIT BY MR -- was: messArr.size()*/; a++) {
/* EDIT BY MR -- the add loop
MessageObject obj = messArr.get(a);
approximateHeightSum += obj.getApproximateHeight();
if (currentUser != null && currentUser.bot && obj.isOut()) {
obj.setIsRead();
}
if (messagesDict[loadIndex].containsKey(obj.getId())) {
continue;
}
if (loadIndex == 1) {
obj.setIsRead();
}
if (loadIndex == 0 && ChatObject.isChannel(currentChat) && obj.getId() == 1) {
endReached[loadIndex] = true;
cacheEndReached[loadIndex] = true;
}
if (obj.getId() > 0) {
maxMessageId[loadIndex] = Math.min(obj.getId(), maxMessageId[loadIndex]);
minMessageId[loadIndex] = Math.max(obj.getId(), minMessageId[loadIndex]);
@@ -4741,6 +4771,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (!obj.isOut() && obj.isUnread()) {
wasUnread = true;
}
messagesDict[loadIndex].put(obj.getId(), obj);
ArrayList<MessageObject> dayArray = messagesByDays.get(obj.dateKey);
@@ -4803,7 +4834,12 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
scrollToMessagePosition = -9000;
}
}
} // -------- /add loop ------------
*/
}
if (load_type == 0 && newRowsCount == 0) {
loadsCount--;
}
@@ -4820,6 +4856,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
if (load_type == 1) {
/* EDIT BY MR
if (messArr.size() != count && !isCache) {
forwardEndReached[loadIndex] = true;
if (loadIndex != 1) {
@@ -4830,6 +4867,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
startLoadFromMessageId = 0;
}
*/
if (newRowsCount > 0) {
int firstVisPos = chatLayoutManager.findLastVisibleItemPosition();
int top = 0;
@@ -4846,6 +4884,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
loadingForward = false;
} else {
/* EDIT BY MR
if (messArr.size() < count && load_type != 3) {
if (isCache) {
if (currentEncryptedChat != null || isBroadcast) {
@@ -4858,6 +4897,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
endReached[loadIndex] = true;// TODO if < 7 from unread
}
}
*/
loading = false;
if (chatListView != null) {