From 601a1a6564d3247f335e0e9ea55240440c675c79 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 13 Oct 2017 14:38:11 +0200
Subject: [PATCH] The cpimFrom address field in the ChatMessage is useless.

---
 src/chat/chat-message/chat-message-p.h           | 4 ----
 src/chat/chat-message/chat-message.cpp           | 5 -----
 src/chat/chat-room/chat-room.cpp                 | 1 -
 src/chat/modifier/cpim-chat-message-modifier.cpp | 4 ++--
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/chat/chat-message/chat-message-p.h b/src/chat/chat-message/chat-message-p.h
index 40f7ea492..73c8a58f2 100644
--- a/src/chat/chat-message/chat-message-p.h
+++ b/src/chat/chat-message/chat-message-p.h
@@ -57,9 +57,6 @@ public:
 
 	void setApplyModifiers (bool value) { applyModifiers = value; }
 
-	const Address &getCpimFromAddress () const { return cpimFrom; }
-	void setCpimFromAddress (const Address &addr);
-
 	void setDirection (ChatMessage::Direction dir);
 
 	void setState(ChatMessage::State state);
@@ -129,7 +126,6 @@ private:
 	unsigned int storageId = 0;
 	Address from;
 	Address to;
-	Address cpimFrom;
 	time_t time = 0;
 	std::string id;
 	std::string appData;
diff --git a/src/chat/chat-message/chat-message.cpp b/src/chat/chat-message/chat-message.cpp
index bec65cd75..94bea15a8 100644
--- a/src/chat/chat-message/chat-message.cpp
+++ b/src/chat/chat-message/chat-message.cpp
@@ -60,11 +60,6 @@ void ChatMessagePrivate::setChatRoom (shared_ptr<ChatRoom> cr) {
 	chatRoom = cr;
 }
 
-void ChatMessagePrivate::setCpimFromAddress (const Address &addr) {
-	cpimFrom = addr;
-	cpimFrom.clean();
-}
-
 void ChatMessagePrivate::setDirection (ChatMessage::Direction dir) {
 	direction = dir;
 }
diff --git a/src/chat/chat-room/chat-room.cpp b/src/chat/chat-room/chat-room.cpp
index 50dc7d370..c980b6566 100644
--- a/src/chat/chat-room/chat-room.cpp
+++ b/src/chat/chat-room/chat-room.cpp
@@ -557,7 +557,6 @@ shared_ptr<ChatMessage> ChatRoom::createMessage () {
 	shared_ptr<ChatMessage> chatMessage = ObjectFactory::create<ChatMessage>(getSharedFromThis());
 	chatMessage->setToAddress(d->peerAddress);
 	chatMessage->setFromAddress(Address(linphone_core_get_identity(d->core)));
-	chatMessage->getPrivate()->setCpimFromAddress(chatMessage->getFromAddress());
 	chatMessage->getPrivate()->setTime(ms_time(0));
 	return chatMessage;
 }
diff --git a/src/chat/modifier/cpim-chat-message-modifier.cpp b/src/chat/modifier/cpim-chat-message-modifier.cpp
index e7e04d870..c017ce9fb 100644
--- a/src/chat/modifier/cpim-chat-message-modifier.cpp
+++ b/src/chat/modifier/cpim-chat-message-modifier.cpp
@@ -40,7 +40,7 @@ ChatMessageModifier::Result CpimChatMessageModifier::encode (const shared_ptr<Ch
 	cpimMessage.addCpimHeader(cpimContentTypeHeader);
 
 	Cpim::FromHeader cpimFromHeader;
-	cpimFromHeader.setValue(cpimAddressAsString(message->getPrivate()->getCpimFromAddress()));
+	cpimFromHeader.setValue(cpimAddressAsString(message->getFromAddress()));
 	cpimMessage.addMessageHeader(cpimFromHeader);
 	Cpim::ToHeader cpimToHeader;
 	cpimToHeader.setValue(cpimAddressAsString(message->getToAddress()));
@@ -133,7 +133,7 @@ ChatMessageModifier::Result CpimChatMessageModifier::decode (const shared_ptr<Ch
 	// Modify the initial message since there was no error
 	message->setInternalContent(newContent);
 	if (cpimFromAddress.isValid())
-		message->getPrivate()->setCpimFromAddress(cpimFromAddress);
+		message->setFromAddress(cpimFromAddress);
 	if (cpimToAddress.isValid())
 		message->setToAddress(cpimToAddress);