blue/squawk
blue/squawk
2
3
Fork 8
Code Issues 23 Pull requests 3 Releases 10 Wiki Activity Actions

uploading message destruction bug, optimisations for release warnings for debug, packaging, readme

Browse source
This commit is contained in:
Blue 2019-11-15 16:30:29 +03:00
parent 326eef864b
commit ae3a1c97e3
7 changed files with 80 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ui/utils/message.cpp
View file

@ -92,6 +92,7 @@ Message::~Message()
if (!commentAdded) {
delete fileComment;
}
delete body;
}
QString Message::getId() const

45
ui/utils/messageline.cpp
View file

@ -47,7 +47,7 @@ MessageLine::~MessageLine()
}
}
MessageLine::Position MessageLine::message(const Shared::Message& msg)
MessageLine::Position MessageLine::message(const Shared::Message& msg, bool forceOutgoing)
{
QString id = msg.getId();
Index::iterator itr = messageIndex.find(id);
@ -59,27 +59,32 @@ MessageLine::Position MessageLine::message(const Shared::Message& msg)
QString sender;
bool outgoing;
if (room) {
if (msg.getFromResource() == myName) {
sender = myName;
outgoing = true;
} else {
sender = msg.getFromResource();
outgoing = false;
}
if (forceOutgoing) {
sender = myName;
outgoing = true;
} else {
if (msg.getOutgoing()) {
sender = myName;
outgoing = true;
} else {
QString jid = msg.getFromJid();
std::map<QString, QString>::iterator itr = palNames.find(jid);
if (itr != palNames.end()) {
sender = itr->second;
if (room) {
if (msg.getFromResource() == myName) {
sender = myName;
outgoing = true;
} else {
sender = jid;
sender = msg.getFromResource();
outgoing = false;
}
} else {
if (msg.getOutgoing()) {
sender = myName;
outgoing = true;
} else {
QString jid = msg.getFromJid();
std::map<QString, QString>::iterator itr = palNames.find(jid);
if (itr != palNames.end()) {
sender = itr->second;
} else {
sender = jid;
}
outgoing = false;
}
outgoing = false;
}
}
@ -328,7 +333,7 @@ void MessageLine::fileError(const QString& messageId, const QString& error)
void MessageLine::appendMessageWithUpload(const Shared::Message& msg, const QString& path)
{
message(msg);
message(msg, true);
QString id = msg.getId();
Message* ui = messageIndex.find(id)->second;
connect(ui, &Message::buttonClicked, this, &MessageLine::onUpload); //this is in case of retry;

4
ui/utils/messageline.h
View file

@ -43,7 +43,7 @@ public:
MessageLine(bool p_room, QWidget* parent = 0);
~MessageLine();
Position message(const Shared::Message& msg);
Position message(const Shared::Message& msg, bool forceOutgoing = false);
void setMyName(const QString& name);
void setPalName(const QString& jid, const QString& name);
QString firstMessageId() const;
@ -52,7 +52,7 @@ public:
void responseLocalFile(const QString& messageId, const QString& path);
void fileError(const QString& messageId, const QString& error);
void fileProgress(const QString& messageId, qreal progress);
void appendMessageWithUpload(const Shared::Message& message, const QString& path);
void appendMessageWithUpload(const Shared::Message& msg, const QString& path);
void removeMessage(const QString& messageId);
signals: