diff --git a/linphone-app/src/components/chat-reaction/ChatReactionListModel.cpp b/linphone-app/src/components/chat-reaction/ChatReactionListModel.cpp index dd5b699ea..bfc7ce25e 100644 --- a/linphone-app/src/components/chat-reaction/ChatReactionListModel.cpp +++ b/linphone-app/src/components/chat-reaction/ChatReactionListModel.cpp @@ -86,7 +86,9 @@ void ChatReactionListModel::clear(){ } void ChatReactionListModel::updateChatReaction(const std::shared_ptr& reaction) { - QString address = Utils::coreStringToAppString(reaction->getFromAddress()->asStringUriOnly()); + auto fromAddress = reaction->getFromAddress()->clone(); + fromAddress->clean(); + QString address = Utils::coreStringToAppString(fromAddress->asStringUriOnly()); auto itReaction = mReactions.find(address); int oldReactionCount = mReactions.size(); auto oldBodies = getBodies(); @@ -137,7 +139,9 @@ void ChatReactionListModel::updateList(){ } bool ChatReactionListModel::exists(std::shared_ptr reaction) const { - QString address = Utils::coreStringToAppString(reaction->getFromAddress()->asStringUriOnly()); + auto fromAddress = reaction->getFromAddress()->clone(); + fromAddress->clean(); + QString address = Utils::coreStringToAppString(fromAddress->asStringUriOnly()); auto itReaction = mReactions.find(address); if(itReaction != mReactions.end()) return (*itReaction)->getBody() == Utils::coreStringToAppString(reaction->getBody()); @@ -181,11 +185,13 @@ void ChatReactionListModel::onNewMessageReaction(const std::shared_ptr & message, const std::shared_ptr & address) { - mReactions.remove(Utils::coreStringToAppString(address->asStringUriOnly())); + auto fromAddress = address->clone(); + fromAddress->clean(); + mReactions.remove(Utils::coreStringToAppString(fromAddress->asStringUriOnly())); mBodies.clear(); for(auto it : mReactions) mBodies[it->getBody()].push_back(it); updateList(); emit chatReactionCountChanged(); emit bodiesChanged(); -} \ No newline at end of file +} diff --git a/linphone-app/src/components/chat-reaction/ChatReactionModel.cpp b/linphone-app/src/components/chat-reaction/ChatReactionModel.cpp index 6d6150e33..d682a7ab0 100644 --- a/linphone-app/src/components/chat-reaction/ChatReactionModel.cpp +++ b/linphone-app/src/components/chat-reaction/ChatReactionModel.cpp @@ -28,7 +28,9 @@ ChatReactionModel::ChatReactionModel(const std::shared_ptr& reaction) { App::getInstance()->getEngine()->setObjectOwnership(this, QQmlEngine::CppOwnership);// Avoid QML to destroy it when passing by Q_INVOKABLE mBody = Utils::coreStringToAppString(reaction->getBody()); - mFromAddress = Utils::coreStringToAppString(reaction->getFromAddress()->asStringUriOnly()); + auto fromAddress = reaction->getFromAddress()->clone(); + fromAddress->clean(); + mFromAddress = Utils::coreStringToAppString(fromAddress->asStringUriOnly()); } QString ChatReactionModel::getBody() const { diff --git a/linphone-sdk b/linphone-sdk index a20e90bab..bf9106ee5 160000 --- a/linphone-sdk +++ b/linphone-sdk @@ -1 +1 @@ -Subproject commit a20e90babe7e6dc4def83720e7dce96ba3f917af +Subproject commit bf9106ee57b8a32aea2693f0fc69c2397a66d570