witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Added implementation of == operator on Content object + added logs and return values in CPIM Chat Message Modifier

Browse source
This commit is contained in:
Sylvain Berfini 2017-10-04 11:39:32 +02:00
parent b7fdc47128
commit f9e89679b3
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/chat/modifier/cpim-chat-message-modifier.cpp
View file

@ -22,6 +22,7 @@
#include "content/content-type.h"
#include "content/content.h"
#include "address/address.h"
#include "logger/logger.h"
#include "chat/chat-message-p.h"
// =============================================================================
@ -60,7 +61,8 @@ int CpimChatMessageModifier::encode (ChatMessagePrivate *messagePrivate) {
message.setContent(contentBody);
if (!message.isValid()) {
//TODO
lError() << "[CPIM] Message is invalid: " << contentBody;
return 500;
} else {
Content newContent;
ContentType newContentType("Message/CPIM");
@ -80,7 +82,7 @@ int CpimChatMessageModifier::decode (ChatMessagePrivate *messagePrivate) {
}
ContentType contentType = content.getContentType();
if (contentType.asString() == "Message/CPIM") {
if (ContentType::isCpim(contentType.asString())) {
const vector<char> body = content.getBody();
string contentBody(body.begin(), body.end());
shared_ptr<const Cpim::Message> message = Cpim::Message::createFromString(contentBody);
@ -91,10 +93,12 @@ int CpimChatMessageModifier::decode (ChatMessagePrivate *messagePrivate) {
newContent.setBody(message->getContent());
messagePrivate->internalContent = newContent;
} else {
//TODO
lError() << "[CPIM] Message is invalid: " << contentBody;
return 500;
}
} else {
//TODO
lError() << "[CPIM] Message is not CPIM but " << contentType.asString();
return -1;
}
return 0;
}

4
src/content/content.cpp
View file

@ -72,8 +72,8 @@ Content &Content::operator= (Content &&src) {
}
bool Content::operator==(const Content& content) {
// return true if the two are equal, and false otherwise.
return true;
L_D();
return d->contentType == content.getContentType() && d->body == content.getBody() && d->contentDisposition == content.getContentDisposition();
}
const ContentType &Content::getContentType () const {