From af471f4cf83a17827a4ce6537c9c055ee8a98dae Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Fri, 10 Nov 2017 12:25:33 +0100
Subject: [PATCH] Adapt getFreshMsgCount() to new core.

---
 MessengerProj/jni/mrwrapper.c                       | 13 +++++++------
 .../java/com/b44t/messenger/Cells/ChatlistCell.java |  2 +-
 .../src/main/java/com/b44t/messenger/MrChat.java    |  1 -
 .../src/main/java/com/b44t/messenger/MrMailbox.java |  2 ++
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/MessengerProj/jni/mrwrapper.c b/MessengerProj/jni/mrwrapper.c
index 36dfa03d4..773e5cf21 100644
--- a/MessengerProj/jni/mrwrapper.c
+++ b/MessengerProj/jni/mrwrapper.c
@@ -450,6 +450,13 @@ JNIEXPORT void Java_com_b44t_messenger_MrMailbox_deleteChat(JNIEnv *env, jclass
 
 /* MrMailbox - handle messages */
 
+
+JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_getFreshMsgCount(JNIEnv *env, jclass cls, jint chat_id)
+{
+	return mrmailbox_get_fresh_msg_count(get_mrmailbox_t(env, cls), chat_id);
+}
+
+
 JNIEXPORT jlong Java_com_b44t_messenger_MrMailbox_MrMailboxGetMsg(JNIEnv *env, jclass c, jlong hMailbox, jint id)
 {
 	return (jlong)mrmailbox_get_msg((mrmailbox_t*)hMailbox, id);
@@ -789,12 +796,6 @@ JNIEXPORT jint Java_com_b44t_messenger_MrChat_MrChatGetDraftReplyToMsgId(JNIEnv
 }
 
 
-JNIEXPORT jint Java_com_b44t_messenger_MrChat_getFreshMsgCount(JNIEnv *env, jclass cls)
-{
-	return mrchat_get_fresh_msg_count(get_mrchat_t(env, cls));
-}
-
-
 JNIEXPORT jint Java_com_b44t_messenger_MrChat_MrChatSetDraft(JNIEnv *env, jclass c, jlong hChat, jstring draft /* NULL=delete */, jint replyToMsgId)
 {
 	CHAR_REF(draft);
diff --git a/MessengerProj/src/main/java/com/b44t/messenger/Cells/ChatlistCell.java b/MessengerProj/src/main/java/com/b44t/messenger/Cells/ChatlistCell.java
index ef06a39ce..675ce99d7 100644
--- a/MessengerProj/src/main/java/com/b44t/messenger/Cells/ChatlistCell.java
+++ b/MessengerProj/src/main/java/com/b44t/messenger/Cells/ChatlistCell.java
@@ -493,7 +493,7 @@ public class ChatlistCell extends BaseCell {
 
     public void update(int mask) {
         if( m_showUnreadCount ) {
-            unreadCount = m_mrChat.getFreshMsgCount();
+            unreadCount = MrMailbox.getFreshMsgCount(m_mrChat.getId());
         }
 
         if (mask != 0) {
diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MrChat.java b/MessengerProj/src/main/java/com/b44t/messenger/MrChat.java
index f20875d7d..9079585dd 100644
--- a/MessengerProj/src/main/java/com/b44t/messenger/MrChat.java
+++ b/MessengerProj/src/main/java/com/b44t/messenger/MrChat.java
@@ -74,7 +74,6 @@ public class MrChat {
     public int setDraft(String draft/*NULL=delete*/, long replyToMsgId) {
         return MrChatSetDraft(m_hChat, draft, replyToMsgId);
     }
-    public native int getFreshMsgCount();
 
     private long                  m_hChat;  // must not be renamed as referenced by JNI under the name "m_hChat"
     private native static void    MrChatUnref                (long hChat);
diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java b/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java
index 99724fb02..84865eb9e 100644
--- a/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java
+++ b/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java
@@ -165,6 +165,8 @@ public class MrMailbox {
         return MrMailboxGetMsgInfo(m_hMailbox, id);
     }
 
+    public static native int getFreshMsgCount(int chat_id);
+
     public native static void deleteMsgs(int msg_ids[]);
     public native static void forwardMsgs(int msg_ids[], int chat_ids);