feat(Chat): better architecture

coreapi/callbacks.c

@@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "c-wrapper/c-wrapper.h"
 #include "call/call-p.h"
-#include "chat/chat-room.h"
+#include "chat/chat-room/chat-room.h"
 #include "conference/session/call-session.h"
 #include "conference/session/call-session-p.h"
 #include "conference/session/media-session.h"

coreapi/chat.c

@@ -36,10 +36,10 @@
 #include "linphone/wrapper_utils.h"
 
 #include "c-wrapper/c-wrapper.h"
-#include "chat/basic-chat-room.h"
-#include "chat/client-group-chat-room.h"
+#include "chat/chat-room/basic-chat-room.h"
+#include "chat/chat-room/client-group-chat-room.h"
 #include "chat/real-time-text-chat-room.h"
-#include "chat/real-time-text-chat-room-p.h"
+#include "chat/chat-room/real-time-text-chat-room-p.h"
 #include "content/content-type.h"
 
 using namespace std;

coreapi/chat_file_transfer.c

@@ -26,7 +26,7 @@
 #include "private.h"
 
 #include "c-wrapper/c-wrapper.h"
-#include "chat/chat-room.h"
+#include "chat/chat-room/chat-room.h"
 
 LinphoneChatMessage *linphone_chat_room_create_file_transfer_message(LinphoneChatRoom *cr, const LinphoneContent *initial_content) {
 	return L_GET_C_BACK_PTR(L_GET_CPP_PTR_FROM_C_OBJECT(cr)->createFileTransferMessage(initial_content));

coreapi/message_storage.c

@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifdef SQLITE_STORAGE_ENABLED
 
-#include "chat/chat-room.h"
+#include "chat/chat-room/chat-room.h"
 
 #ifndef _WIN32
 #if !defined(__QNXNTO__) && !defined(__ANDROID__)

src/CMakeLists.txt

@@ -29,14 +29,16 @@ set(LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES
 	call/call-listener.h
 	call/call-p.h
 	call/call.h
-	chat/basic-chat-room-p.h
-	chat/basic-chat-room.h
-	chat/chat-message-p.h
-	chat/chat-message.h
-	chat/chat-room-p.h
-	chat/chat-room.h
-	chat/client-group-chat-room-p.h
-	chat/client-group-chat-room.h
+	chat/chat-message/chat-message-p.h
+	chat/chat-message/chat-message.h
+	chat/chat-room/basic-chat-room-p.h
+	chat/chat-room/basic-chat-room.h
+	chat/chat-room/chat-room-p.h
+	chat/chat-room/chat-room.h
+	chat/chat-room/client-group-chat-room-p.h
+	chat/chat-room/client-group-chat-room.h
+	chat/chat-room/real-time-text-chat-room-p.h
+	chat/chat-room/real-time-text-chat-room.h
 	chat/cpim/cpim.h
 	chat/cpim/header/cpim-core-headers.h
 	chat/cpim/header/cpim-generic-header.h
@@ -51,8 +53,6 @@ set(LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES
 	chat/modifier/cpim-chat-message-modifier.h
 	chat/modifier/encryption-chat-message-modifier.h
 	chat/modifier/multipart-chat-message-modifier.h
-	chat/real-time-text-chat-room-p.h
-	chat/real-time-text-chat-room.h
 	conference/conference-listener.h
 	conference/conference.h
 	conference/local-conference-event-handler-p.h
@@ -124,10 +124,11 @@ set(LINPHONE_CXX_OBJECTS_SOURCE_FILES
 	c-wrapper/api/c-participant.cpp
 	c-wrapper/internal/c-sal.cpp
 	call/call.cpp
-	chat/basic-chat-room.cpp
-	chat/chat-message.cpp
-	chat/chat-room.cpp
-	chat/client-group-chat-room.cpp
+	chat/chat-message/chat-message.cpp
+	chat/chat-room/basic-chat-room.cpp
+	chat/chat-room/chat-room.cpp
+	chat/chat-room/client-group-chat-room.cpp
+	chat/chat-room/real-time-text-chat-room.cpp
 	chat/cpim/header/cpim-core-headers.cpp
 	chat/cpim/header/cpim-generic-header.cpp
 	chat/cpim/header/cpim-header.cpp
@@ -139,7 +140,6 @@ set(LINPHONE_CXX_OBJECTS_SOURCE_FILES
 	chat/modifier/cpim-chat-message-modifier.cpp
 	chat/modifier/encryption-chat-message-modifier.cpp
 	chat/modifier/multipart-chat-message-modifier.cpp
-	chat/real-time-text-chat-room.cpp
 	conference/conference.cpp
 	conference/local-conference-event-handler.cpp
 	conference/local-conference.cpp

src/c-wrapper/api/c-chat-message.cpp

@@ -27,10 +27,10 @@
 #include "address/address.h"
 #include "content/content.h"
 #include "content/content-type.h"
-#include "chat/chat-message-p.h"
-#include "chat/chat-message.h"
-#include "chat/chat-room-p.h"
-#include "chat/real-time-text-chat-room-p.h"
+#include "chat/chat-message/chat-message-p.h"
+#include "chat/chat-message/chat-message.h"
+#include "chat/chat-room/chat-room-p.h"
+#include "chat/chat-room/real-time-text-chat-room-p.h"
 
 // =============================================================================
 

src/c-wrapper/api/c-chat-room.cpp

@@ -24,9 +24,9 @@
 #include "linphone/api/c-chat-room.h"
 
 #include "c-wrapper/c-wrapper.h"
-#include "chat/basic-chat-room.h"
-#include "chat/client-group-chat-room.h"
-#include "chat/real-time-text-chat-room-p.h"
+#include "chat/chat-room/basic-chat-room.h"
+#include "chat/chat-room/client-group-chat-room.h"
+#include "chat/chat-room/real-time-text-chat-room-p.h"
 #include "conference/participant.h"
 
 // =============================================================================

src/c-wrapper/api/c-event-log.cpp

@@ -22,7 +22,7 @@
 
 #include "c-wrapper/c-wrapper.h"
 #include "call/call.h"
-#include "chat/chat-message.h"
+#include "chat/chat-message/chat-message.h"
 #include "event-log/call-event.h"
 #include "event-log/chat-message-event.h"
 #include "event-log/conference-participant-event.h"

src/chat/chat-message/chat-message-p.h

@@ -120,11 +120,11 @@ private:
 	Address from;
 	Address to;
 	time_t time = 0;
-	std::string id = "";
-	std::string appData = "";
-	std::string fileTransferFilePath = "";
-	std::string externalBodyUrl = "";
-	std::string rttMessage = "";
+	std::string id;
+	std::string appData;
+	std::string fileTransferFilePath;
+	std::string externalBodyUrl;
+	std::string rttMessage;
 	bool isSecured = false;
 	bool isReadOnly = false;
 	std::list<Content > contents;
@@ -140,7 +140,7 @@ private:
 	unsigned char currentSendStep = Step::None;
 	// Cache for returned values, used for compatibility with previous C API
 	ContentType cContentType;
-	std::string cText = "";
+	std::string cText;
 	// Used for compatibility with previous C API
 	LinphoneContent *cFileTransferInformation = NULL;
 

src/chat/chat-message/chat-message.cpp

@@ -25,14 +25,14 @@
 #include "c-wrapper/c-wrapper.h"
 #include "address/address.h"
 
-#include "chat-message-p.h"
+#include "chat/chat-message/chat-message-p.h"
 
 #include "content/content.h"
-#include "chat-room-p.h"
-#include "real-time-text-chat-room.h"
-#include "modifier/cpim-chat-message-modifier.h"
-#include "modifier/encryption-chat-message-modifier.h"
-#include "modifier/multipart-chat-message-modifier.h"
+#include "chat/chat-room/chat-room-p.h"
+#include "chat/chat-room/real-time-text-chat-room.h"
+#include "chat/modifier/cpim-chat-message-modifier.h"
+#include "chat/modifier/encryption-chat-message-modifier.h"
+#include "chat/modifier/multipart-chat-message-modifier.h"
 
 #include "logger/logger.h"
 #include "ortp/b64.h"

src/chat/chat-room/basic-chat-room-p.h

@@ -24,7 +24,7 @@
 #include "private.h"
 
 #include "basic-chat-room.h"
-#include "chat/chat-room-p.h"
+#include "chat/chat-room/chat-room-p.h"
 
 // =============================================================================
 

src/chat/chat-room/basic-chat-room.h

@@ -20,7 +20,7 @@
 #ifndef _BASIC_CHAT_ROOM_H_
 #define _BASIC_CHAT_ROOM_H_
 
-#include "chat/chat-room.h"
+#include "chat/chat-room/chat-room.h"
 
 // =============================================================================
 

src/chat/chat-room/chat-room-p.h

@@ -27,8 +27,8 @@
 #include "private.h"
 
 #include "chat-room.h"
-#include "is-composing-listener.h"
-#include "is-composing.h"
+#include "chat/is-composing-listener.h"
+#include "chat/is-composing.h"
 #include "object/object-p.h"
 
 // =============================================================================

src/chat/chat-room/chat-room.cpp

@@ -23,10 +23,10 @@
 #include "linphone/utils/utils.h"
 
 #include "c-wrapper/c-wrapper.h"
-#include "chat-room-p.h"
-#include "imdn.h"
+#include "chat/chat-room/chat-room-p.h"
+#include "chat/imdn.h"
 #include "content/content.h"
-#include "chat-message-p.h"
+#include "chat/chat-message/chat-message-p.h"
 #include "chat-room.h"
 #include "sal/message-op.h"
 #include "logger/logger.h"

src/chat/chat-room/chat-room.h

@@ -29,7 +29,7 @@
 #include "object/object.h"
 #include "conference/conference-interface.h"
 
-#include "chat-message.h"
+#include "chat/chat-message/chat-message.h"
 
 #include "linphone/types.h"
 

src/chat/chat-room/client-group-chat-room-p.h

@@ -24,7 +24,7 @@
 #include "private.h"
 
 #include "client-group-chat-room.h"
-#include "chat/chat-room-p.h"
+#include "chat/chat-room/chat-room-p.h"
 
 // =============================================================================
 

src/chat/chat-room/client-group-chat-room.h

@@ -23,7 +23,7 @@
 // From coreapi
 #include "private.h"
 
-#include "chat/chat-room.h"
+#include "chat/chat-room/chat-room.h"
 #include "conference/remote-conference.h"
 #include "conference/session/call-session.h"
 

src/chat/chat-room/real-time-text-chat-room-p.h

@@ -23,8 +23,8 @@
 // From coreapi.
 #include "private.h"
 
-#include "real-time-text-chat-room.h"
-#include "chat/chat-room-p.h"
+#include "chat/chat-room/real-time-text-chat-room.h"
+#include "chat/chat-room/chat-room-p.h"
 
 // =============================================================================
 

src/chat/chat-room/real-time-text-chat-room.cpp

@@ -22,7 +22,7 @@
 #include "linphone/utils/utils.h"
 
 #include "real-time-text-chat-room-p.h"
-#include "chat-message-p.h"
+#include "chat/chat-message/chat-message-p.h"
 #include "c-wrapper/c-wrapper.h"
 #include "logger/logger.h"
 

src/chat/chat-room/real-time-text-chat-room.h

@@ -23,7 +23,7 @@
 // From coreapi
 #include "private.h"
 
-#include "chat/chat-room.h"
+#include "chat/chat-room/chat-room.h"
 
 #include "linphone/types.h"
 

src/chat/imdn.cpp

@@ -19,9 +19,9 @@
 
 #include "logger/logger.h"
 
-#include "imdn.h"
-#include "chat/chat-room.h"
-#include "chat/chat-message.h"
+#include "chat/imdn.h"
+#include "chat/chat-room/chat-room.h"
+#include "chat/chat-message/chat-message.h"
 
 // =============================================================================
 

src/chat/is-composing.cpp

@@ -19,10 +19,10 @@
 
 #include "linphone/utils/utils.h"
 
-#include "chat-room-p.h"
+#include "chat/chat-room/chat-room-p.h"
 #include "logger/logger.h"
 
-#include "is-composing.h"
+#include "chat/is-composing.h"
 
 // =============================================================================
 

src/chat/is-composing.h

@@ -22,7 +22,7 @@
 
 #include "linphone/utils/general.h"
 
-#include "is-composing-listener.h"
+#include "chat/is-composing-listener.h"
 
 #include "private.h"
 

src/chat/modifier/cpim-chat-message-modifier.cpp

@@ -18,7 +18,7 @@
  */
 
 #include "address/address.h"
-#include "chat/chat-message.h"
+#include "chat/chat-message/chat-message.h"
 #include "chat/cpim/cpim.h"
 #include "content/content-type.h"
 #include "content/content.h"

src/chat/modifier/encryption-chat-message-modifier.cpp

@@ -19,8 +19,8 @@
 
 #include "address/address.h"
 #include "c-wrapper/c-wrapper.h"
-#include "chat/chat-message.h"
-#include "chat/chat-room.h"
+#include "chat/chat-message/chat-message.h"
+#include "chat/chat-room/chat-room.h"
 #include "content/content-type.h"
 #include "content/content.h"
 

src/chat/modifier/multipart-chat-message-modifier.cpp

@@ -18,8 +18,8 @@
  */
 
 #include "address/address.h"
-#include "chat/chat-message.h"
-#include "chat/chat-room.h"
+#include "chat/chat-message/chat-message.h"
+#include "chat/chat-room/chat-room.h"
 #include "content/content-type.h"
 #include "logger/logger.h"
 

src/db/events-db.cpp

@@ -27,7 +27,7 @@
 #include "linphone/utils/utils.h"
 
 #include "abstract/abstract-db-p.h"
-#include "chat/chat-message.h"
+#include "chat/chat-message/chat-message.h"
 #include "conference/participant.h"
 #include "content/content-type.h"
 #include "content/content.h"

tester/cpim-tester.cpp

@@ -17,8 +17,8 @@
  */
 
 #include "address/address.h"
-#include "chat/basic-chat-room.h"
-#include "chat/chat-message.h"
+#include "chat/chat-room/basic-chat-room.h"
+#include "chat/chat-message/chat-message.h"
 #include "chat/cpim/cpim.h"
 #include "content/content-type.h"
 

tester/multipart-tester.cpp

@@ -17,8 +17,8 @@
  */
 
 #include "address/address.h"
-#include "chat/basic-chat-room.h"
-#include "chat/chat-message.h"
+#include "chat/chat-room/basic-chat-room.h"
+#include "chat/chat-message/chat-message.h"
 #include "content/content-type.h"
 
 #include "liblinphone_tester.h"