1 files changed, 4 insertions, 6 deletions
diff --git a/Swift/QtUI/QtWebKitChatView.cpp b/Swift/QtUI/QtWebKitChatView.cpp
index 4dd67f1..ce3e9cd 100644
--- a/Swift/QtUI/QtWebKitChatView.cpp
+++ b/Swift/QtUI/QtWebKitChatView.cpp
@@ -535,136 +535,134 @@ QString QtWebKitChatView::chatMessageToHTML(const ChatWindow::ChatMessage& messa
 
 std::string QtWebKitChatView::addMessage(
         const QString& message,
         const std::string& senderName,
         bool senderIsSelf,
         std::shared_ptr<SecurityLabel> label,
         const std::string& avatarPath,
         const QString& style,
         const boost::posix_time::ptime& time,
         const HighlightAction& highlight,
         ChatSnippet::Direction direction) {
 
     QString scaledAvatarPath = QtScaledAvatarCache(32).getScaledAvatarPath(avatarPath.c_str());
 
     QString htmlString;
     if (label) {
         htmlString = QString("<span style=\"border: thin dashed grey; padding-left: .5em; padding-right: .5em; color: %1; background-color: %2; font-size: 90%; margin-right: .5em; \" class='swift_label'>").arg(QtUtilities::htmlEscape(P2QSTRING(label->getForegroundColor()))).arg(QtUtilities::htmlEscape(P2QSTRING(label->getBackgroundColor())));
         htmlString += QString("%1</span> ").arg(QtUtilities::htmlEscape(P2QSTRING(label->getDisplayMarking())));
     }
 
     QString styleSpanStart = style == "" ? "" : "<span style=\"" + style + "\">";
     QString styleSpanEnd = style == "" ? "" : "</span>";
 
     bool highlightWholeMessage = highlight.getFrontColor() || highlight.getBackColor();
     QString highlightSpanStart = highlightWholeMessage ? getHighlightSpanStart(highlight) : "";
     QString highlightSpanEnd = highlightWholeMessage ? "</span>" : "";
     htmlString += "<span class='swift_inner_message'>" + styleSpanStart + highlightSpanStart + message + highlightSpanEnd + styleSpanEnd + "</span>" ;
 
     bool appendToPrevious = appendToPreviousCheck(PreviousMessageWasMessage, senderName, senderIsSelf);
 
-    QString qAvatarPath =  scaledAvatarPath.isEmpty() ? "qrc:/icons/avatar.svg" : QUrl::fromLocalFile(scaledAvatarPath).toEncoded();
+    QString qAvatarPath = scaledAvatarPath.isEmpty() ? "qrc:/icons/avatar.svg" : QUrl::fromLocalFile(scaledAvatarPath).toEncoded();
     std::string id = "id" + boost::lexical_cast<std::string>(idCounter_++);
     addMessageBottom(std::make_shared<MessageSnippet>(htmlString, QtUtilities::htmlEscape(P2QSTRING(senderName)), B2QDATE(time), qAvatarPath, senderIsSelf, appendToPrevious, theme_, P2QSTRING(id), direction));
 
     previousMessageWasSelf_ = senderIsSelf;
     previousSenderName_ = P2QSTRING(senderName);
     previousMessageKind_ = PreviousMessageWasMessage;
     return id;
 }
 
 std::string QtWebKitChatView::addAction(const ChatWindow::ChatMessage& message, const std::string &senderName, bool senderIsSelf, std::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const boost::posix_time::ptime& time) {
     return addMessage(" *" + chatMessageToHTML(message) + "*", senderName, senderIsSelf, label, avatarPath, "font-style:italic ", time, message.getHighlightActionSender(), ChatSnippet::getDirection(message));
 }
 
 static QString encodeButtonArgument(const QString& str) {
     return QtUtilities::htmlEscape(P2QSTRING(Base64::encode(createByteArray(Q2PSTRING(str)))));
 }
 
 static QString decodeButtonArgument(const QString& str) {
     return P2QSTRING(byteArrayToString(Base64::decode(Q2PSTRING(str))));
 }
 
 QString QtWebKitChatView::buildChatWindowButton(const QString& name, const QString& id, const QString& arg1, const QString& arg2, const QString& arg3, const QString& arg4, const QString& arg5) {
     QRegExp regex("[A-Za-z][A-Za-z0-9\\-\\_]+");
     Q_ASSERT(regex.exactMatch(id));
     QString html = QString("<input id='%2' type='submit' value='%1' onclick='chatwindow.buttonClicked(\"%2\", \"%3\", \"%4\", \"%5\", \"%6\", \"%7\");' />").arg(name).arg(id).arg(encodeButtonArgument(arg1)).arg(encodeButtonArgument(arg2)).arg(encodeButtonArgument(arg3)).arg(encodeButtonArgument(arg4)).arg(encodeButtonArgument(arg5));
     return html;
 }
 
 void QtWebKitChatView::resizeEvent(QResizeEvent* event) {
     // This code ensures that if the user is scrolled all to the bottom of a chat view,
     // the view stays scrolled to the bottom if the view is resized or if the message
     // input widget becomes multi line.
     if (isAtBottom_) {
         scrollToBottom();
     }
     QWidget::resizeEvent(event);
 }
 
-std::string QtWebKitChatView::addFileTransfer(const std::string& senderName, bool senderIsSelf, const std::string& filename, const boost::uintmax_t sizeInBytes, const std::string& description) {
+std::string QtWebKitChatView::addFileTransfer(const std::string& senderName, const std::string& avatarPath, bool senderIsSelf, const std::string& filename, const boost::uintmax_t sizeInBytes, const std::string& description) {
     SWIFT_LOG(debug) << "addFileTransfer" << std::endl;
     QString ft_id = QString("ft%1").arg(P2QSTRING(boost::lexical_cast<std::string>(idCounter_++)));
 
     QString actionText;
     QString htmlString;
     QString formattedFileSize = P2QSTRING(formatSize(sizeInBytes));
     QString sanitizedFileName = QtUtilities::htmlEscape(P2QSTRING(filename));
     QString sanitizedDescription = QtUtilities::htmlEscape(P2QSTRING(description));
     if (senderIsSelf) {
         // outgoing
         filePaths_[ft_id] = sanitizedFileName;
         actionText = tr("Send file: %1 (%2)").arg(sanitizedFileName).arg(formattedFileSize);
         htmlString = actionText + " <br/>" +
             "<div id='" + ft_id + "'>" +
                 buildChatWindowButton(tr("Cancel"), ButtonFileTransferCancel, ft_id) +
                 buildChatWindowButton(tr("Set Description"), ButtonFileTransferSetDescription, ft_id) +
                 buildChatWindowButton(tr("Send"), ButtonFileTransferSendRequest, ft_id) +
             "</div>";
     } else {
         // incoming
         actionText = tr("Receiving file: %1 (%2)").arg(sanitizedFileName).arg(formattedFileSize);
         if (!sanitizedDescription.isEmpty()) {
             actionText += QString(" \"%1\"").arg(sanitizedDescription);
         }
         htmlString = actionText + " <br/>" +
             "<div id='" + ft_id + "'>" +
                 buildChatWindowButton(tr("Cancel"), ButtonFileTransferCancel, ft_id) +
                 buildChatWindowButton(tr("Accept"), ButtonFileTransferAcceptRequest, ft_id, P2QSTRING(filename)) +
             "</div>";
     }
 
-    //addMessage(message, senderName, senderIsSelf, std::shared_ptr<SecurityLabel>(), "", boost::posix_time::second_clock::local_time());
-
     bool appendToPrevious = appendToPreviousCheck(PreviousMessageWasFileTransfer, senderName, senderIsSelf);
-
-    QString qAvatarPath = "qrc:/icons/avatar.svg";
+    QString scaledAvatarPath = QtScaledAvatarCache(32).getScaledAvatarPath(avatarPath.c_str());
+    QString qAvatarPath = scaledAvatarPath.isEmpty() ? "qrc:/icons/avatar.svg" : QUrl::fromLocalFile(scaledAvatarPath).toEncoded();
     std::string id = "ftmessage" + boost::lexical_cast<std::string>(idCounter_++);
     addMessageBottom(std::make_shared<MessageSnippet>(htmlString, QtUtilities::htmlEscape(P2QSTRING(senderName)), B2QDATE(boost::posix_time::second_clock::universal_time()), qAvatarPath, senderIsSelf, appendToPrevious, theme_, P2QSTRING(id), ChatSnippet::getDirection(actionText)));
 
     previousMessageWasSelf_ = senderIsSelf;
     previousSenderName_ = P2QSTRING(senderName);
     previousMessageKind_ = PreviousMessageWasFileTransfer;
     return Q2PSTRING(ft_id);
 }
 
 void QtWebKitChatView::setFileTransferProgress(std::string id, const int percentageDone) {
     setFileTransferProgress(P2QSTRING(id), percentageDone);
 }
 
 void QtWebKitChatView::setFileTransferStatus(std::string id, const ChatWindow::FileTransferState state, const std::string& msg) {
     setFileTransferStatus(P2QSTRING(id), state, P2QSTRING(msg));
 }
 
 std::string QtWebKitChatView::addWhiteboardRequest(const QString& contact, bool senderIsSelf) {
     QString wb_id = QString("wb%1").arg(P2QSTRING(boost::lexical_cast<std::string>(idCounter_++)));
     QString htmlString;
     QString actionText;
     if (senderIsSelf) {
         actionText = tr("Starting whiteboard chat");
         htmlString = "<div id='" + wb_id + "'>" + actionText + "<br />"+
                 buildChatWindowButton(tr("Cancel"), ButtonWhiteboardSessionCancel, wb_id) +
             "</div>";
     } else {
         actionText = tr("%1 would like to start a whiteboard chat");
         htmlString = "<div id='" + wb_id + "'>" + actionText.arg(QtUtilities::htmlEscape(contact)) + ": <br/>" +
                 buildChatWindowButton(tr("Cancel"), ButtonWhiteboardSessionCancel, wb_id) +