update call history list when new call incoming (somehow if juste the new call log is added, it ends at the end of the list when updating the whole list) fix #LINQT-2444

Linphone/core/call-history/CallHistoryCore.cpp

@@ -51,7 +51,8 @@ CallHistoryCore::CallHistoryCore(const std::shared_ptr<linphone::CallLog> &callL
 	mStatus = LinphoneEnums::fromLinphone(callLog->getStatus());
 	mDate = QDateTime::fromMSecsSinceEpoch(callLog->getStartDate() * 1000);
 	mIsOutgoing = callLog->getDir() == linphone::Call::Dir::Outgoing;
-	mDuration = QString::number(callLog->getDuration());
+	mDuration = callLog->getDuration();
+	mDurationString = QString::number(mDuration);
 	mIsConference = callLog->wasConference();
 	mCallId = Utils::coreStringToAppString(callLog->getCallId());
 	mHasChat = false;
@@ -149,16 +150,17 @@ ConferenceInfoGui *CallHistoryCore::getConferenceInfoGui() const {
 	return mConferenceInfo ? new ConferenceInfoGui(mConferenceInfo) : nullptr;
 }
 
-QString CallHistoryCore::getDuration() const {
+int CallHistoryCore::getDuration() const {
 	return mDuration;
 }
 
-void CallHistoryCore::setDuration(const QString &duration) {
+QString CallHistoryCore::getDurationString() const {
+	return mDurationString;
+}
+
+QDateTime CallHistoryCore::getStartDate() const {
 	mustBeInMainThread(log().arg(Q_FUNC_INFO));
-	if (mDuration != duration) {
+	return mDate;
-		mDuration = duration;
-		emit durationChanged(mDuration);
-	}
 }
 
 std::shared_ptr<CallHistoryModel> CallHistoryCore::getModel() const {

Linphone/core/call-history/CallHistoryCore.hpp

@@ -43,7 +43,7 @@ class CallHistoryCore : public QObject, public AbstractObject {
 	Q_PROPERTY(ConferenceInfoGui *conferenceInfo READ getConferenceInfoGui CONSTANT)
 	Q_PROPERTY(QDateTime date MEMBER mDate CONSTANT)
 	Q_PROPERTY(LinphoneEnums::CallStatus status MEMBER mStatus CONSTANT)
-	Q_PROPERTY(QString duration READ getDuration WRITE setDuration NOTIFY durationChanged)
+	Q_PROPERTY(int duration READ getDuration NOTIFY durationChanged)
 
 public:
 	static QSharedPointer<CallHistoryCore> create(const std::shared_ptr<linphone::CallLog> &callLogs);
@@ -53,8 +53,10 @@ public:
 	void setSelf(QSharedPointer<CallHistoryCore> me);
 	ConferenceInfoGui *getConferenceInfoGui() const;
 
-	QString getDuration() const;
+	int getDuration() const;
-	void setDuration(const QString &duration);
+	QString getDurationString() const;
+
+	QDateTime getStartDate() const;
 
 	std::shared_ptr<CallHistoryModel> getModel() const;
 
@@ -71,13 +73,15 @@ public:
 	QString mCallId;
 
 signals:
-	void durationChanged(QString duration);
+	void durationChanged(int duration);
+	void durationStringChanged(QString duration);
 	void displayNameChanged();
 	void friendUpdated(); // When a friend is created, this log is linked to it.
 	void removed();
 
 private:
-	QString mDuration;
+	int mDuration;
+	QString mDurationString;
 	QSharedPointer<ConferenceInfoCore> mConferenceInfo = nullptr;
 	bool mHasChat = false;
 	std::shared_ptr<CallHistoryModel> mCallHistoryModel;

Linphone/core/call-history/CallHistoryList.cpp

@@ -56,11 +56,11 @@ CallHistoryList::~CallHistoryList() {
 void CallHistoryList::setSelf(QSharedPointer<CallHistoryList> me) {
 	mModelConnection = SafeConnection<CallHistoryList, CoreModel>::create(me, CoreModel::getInstance());
 
-	mModelConnection->makeConnectToCore(&CallHistoryList::lUpdate, [this]() {
+	mModelConnection->makeConnectToCore(&CallHistoryList::lUpdate, [this](bool signalReset) {
-		clearData();
+		mustBeInMainThread(log().arg(Q_FUNC_INFO));
-		emit listAboutToBeReset();
+		if (signalReset) emit listAboutToBeReset();
 		mModelConnection->invokeToModel([this]() {
-			mustBeInLinphoneThread(getClassName());
+			mustBeInLinphoneThread(Q_FUNC_INFO);
 			// Avoid copy to lambdas
 			QList<QSharedPointer<CallHistoryCore>> *callLogs = new QList<QSharedPointer<CallHistoryCore>>();
 			std::list<std::shared_ptr<linphone::CallLog>> linphoneCallLogs;
@@ -73,8 +73,13 @@ void CallHistoryList::setSelf(QSharedPointer<CallHistoryList> me) {
 				callLogs->push_front(model);
 			}
 			mModelConnection->invokeToCore([this, callLogs]() {
-				mustBeInMainThread(getClassName());
+				mustBeInMainThread(Q_FUNC_INFO);
-				resetData<CallHistoryCore>(*callLogs);
+				beginResetModel();
+				mList.clear();
+				for (auto &item : *callLogs) {
+					mList.append(item);
+				}
+				endResetModel();
 				delete callLogs;
 			});
 		});
@@ -84,21 +89,24 @@ void CallHistoryList::setSelf(QSharedPointer<CallHistoryList> me) {
 	mModelConnection->makeConnectToModel(
 	    &CoreModel::callLogUpdated,
 	    [this](const std::shared_ptr<linphone::Core> &core, const std::shared_ptr<linphone::CallLog> &callLog) {
-		    QSharedPointer<CallHistoryCore> *callLogs = new QSharedPointer<CallHistoryCore>[1];
+		    if (!callLog->getLocalAddress()->weakEqual(
-		    auto model = createCallHistoryCore(callLog);
+		            CoreModel::getInstance()->getCore()->getDefaultAccount()->getParams()->getIdentityAddress())) {
-		    callLogs[0] = model;
+			    lInfo() << "call log does not refer to current account, return";
-		    mModelConnection->invokeToCore([this, callLogs]() {
+			    return;
-			    auto oldLog = std::find_if(mList.begin(), mList.end(), [callLogs](QSharedPointer<QObject> log) {
+		    }
-				    return (*callLogs)->mCallId == log.objectCast<CallHistoryCore>()->mCallId;
+		    emit lUpdate(false);
-			    });
+		    // auto callLogCore = createCallHistoryCore(callLog);
-			    toConnect(callLogs->get());
+		    // mModelConnection->invokeToCore([this, callLogCore]() {
-			    if (oldLog == mList.end()) { // New
+		    //     auto oldLog = std::find_if(mList.begin(), mList.end(), [callLogCore](QSharedPointer<QObject> log) {
-				    prepend(*callLogs);
+		    // 	    return (callLogCore)->mCallId == log.objectCast<CallHistoryCore>()->mCallId;
-			    } else { // Update (status, duration, etc …)
+		    //     });
-				    replace(oldLog->objectCast<CallHistoryCore>(), *callLogs);
+		    //     toConnect(callLogCore.get());
-			    }
+		    //     if (oldLog == mList.end()) { // New
-			    delete[] callLogs;
+		    // 	    prepend(callLogCore);
-		    });
+		    //     } else { // Update (status, duration, etc …)
+		    // 	    replace(oldLog->objectCast<CallHistoryCore>(), callLogCore);
+		    //     }
+		    // });
 	    });
 	mModelConnection->makeConnectToCore(&CallHistoryList::lRemoveEntriesForAddress, [this](QString address) {
 		mModelConnection->invokeToModel([this, address]() {

Linphone/core/call-history/CallHistoryList.hpp

@@ -59,7 +59,7 @@ public:
 	// void displayMore();
 
 signals:
-	void lUpdate();
+	void lUpdate(bool signalReset = true);
 	void lRemoveEntriesForAddress(QString address);
 	void lRemoveAllEntries();
 	void listAboutToBeReset();

Linphone/view/Page/Main/Call/CallPage.qml

@@ -683,9 +683,7 @@ AbstractMainPage {
                                             Layout.fillWidth: true
                                         }
                                         Text {
-                                            text: UtilsCpp.formatElapsedTime(
+                                            text: UtilsCpp.formatElapsedTime(modelData.core.duration,false)
-                                                        modelData.core.duration,
-                                                        false)
                                             font {
                                                 pixelSize: Utils.getSizeWithScreenRatio(12)
                                                 weight: Utils.getSizeWithScreenRatio(300)