- Reset all counts when requested

- Add an interface to reset count when the GUI need it
- Replace handler event name to be more specific on what it is doing and make a new connection when ChatModel request to reset the count

linphone-app/src/components/chat/ChatModel.cpp

@@ -638,9 +638,8 @@ void ChatModel::compose () {
 void ChatModel::resetMessageCount () {
   if (mChatRoom->getUnreadMessagesCount() > 0){
     mChatRoom->markAsRead();// Marking as read is only for messages. Not for calls.
-    emit messageCountReset();
-  }else if (CoreManager::getInstance()->getMissedCallCount(getPeerAddress(), getLocalAddress())>0)
-    emit messageCountReset();
+  }
+  emit messageCountReset();
 }
 
 // -----------------------------------------------------------------------------

linphone-app/src/components/chat/ChatProxyModel.cpp

@@ -209,8 +209,6 @@ void ChatProxyModel::reload () {
   mChatModel = CoreManager::getInstance()->getChatModel(mPeerAddress, mLocalAddress);
 
   if (mChatModel) {
-    mChatModel->resetMessageCount();
-    mChatModel->focused();
 
     ChatModel *chatModel = mChatModel.get();
     QObject::connect(chatModel, &ChatModel::isRemoteComposingChanged, this, &ChatProxyModel::handleIsRemoteComposingChanged);
@@ -220,7 +218,11 @@ void ChatProxyModel::reload () {
 
   static_cast<ChatModelFilter *>(sourceModel())->setSourceModel(mChatModel.get());
 }
-
+void ChatProxyModel::resetMessageCount(){
+	if( mChatModel){
+		mChatModel->resetMessageCount();
+	}
+}
 // -----------------------------------------------------------------------------
 
 static inline QWindow *getParentWindow (QObject *object) {

linphone-app/src/components/chat/ChatProxyModel.hpp

@@ -60,6 +60,8 @@ public:
 
   Q_INVOKABLE void compose ();
 
+  Q_INVOKABLE void resetMessageCount();
+
 signals:
   void peerAddressChanged (const QString &peerAddress);
   void localAddressChanged (const QString &localAddress);

linphone-app/src/components/core/event-count-notifier/AbstractEventCountNotifier.cpp

@@ -98,18 +98,21 @@ void AbstractEventCountNotifier::handleChatModelCreated (const shared_ptr<ChatMo
   );
   QObject::connect(
     chatModelPtr, &ChatModel::focused,
-    this, [this, chatModelPtr]() { handleChatModelFocused(chatModelPtr); }
+    this, [this, chatModelPtr]() { handleResetMissedCalls(chatModelPtr); }
+  );
+  QObject::connect(
+    chatModelPtr, &ChatModel::messageCountReset,
+    this, [this, chatModelPtr]() { handleResetMissedCalls(chatModelPtr); }
   );
 }
 
-void AbstractEventCountNotifier::handleChatModelFocused (ChatModel *chatModel) {
+void AbstractEventCountNotifier::handleResetMissedCalls (ChatModel *chatModel) {
   auto it = mMissedCalls.find({ Utils::cleanSipAddress(chatModel->getPeerAddress()), Utils::cleanSipAddress(chatModel->getLocalAddress()) });
   if (it != mMissedCalls.cend()) {
     mMissedCalls.erase(it);
     internalnotifyEventCount();
   }
 }
-
 void AbstractEventCountNotifier::handleCallMissed (CallModel *callModel) {
   ++mMissedCalls[{ Utils::cleanSipAddress(callModel->getPeerAddress()), Utils::cleanSipAddress(callModel->getLocalAddress()) }];
   internalnotifyEventCount();

linphone-app/src/components/core/event-count-notifier/AbstractEventCountNotifier.hpp

@@ -68,7 +68,7 @@ private:
 
   void handleChatModelCreated (const std::shared_ptr<ChatModel> &chatModel);
 
-  void handleChatModelFocused (ChatModel *chatModel);
+  void handleResetMissedCalls (ChatModel *chatModel);
   void handleCallMissed (CallModel *callModel);
 
   QHash<ConferenceId, int> mMissedCalls;

linphone-app/ui/views/App/Main/Conversation.qml

@@ -168,6 +168,7 @@ ColumnLayout  {
         if (!SettingsModel.chatEnabled) {
           setEntryTypeFilter(ChatModel.CallEntry)
         }
+        resetMessageCount()
       }
 
       peerAddress: conversation.peerAddress