Merge lp:~tiagosh/telephony-service/fix-attachment-size into lp:telephony-service

[Tiago Salem Herrmann]

Reduce image sizes before sending them to telepathy. MMS's have a limit of 300k

Reduce image sizes before sending them to telepathy. MMS's have a limit of 300k.

--Checklist--

Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/telephony-service) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:839
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/233/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/49
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/49/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/49

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/233/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Can you please fix the two inline diff comments and also merge latest changes from trunk in your MR?

review: Needs Fixing

[lp:~tiagosh/telephony-service/fix-attachment-size]

840. By Tiago Salem Herrmann on 2014-07-07

improve the width and height check

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:840
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/243/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/59/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/59
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/59/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/59/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/243/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:840
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/246/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/62/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/62
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/62/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/62/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/246/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:840
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/247/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/63/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/63
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/63/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/64/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/247/rebuild

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
No, but not related to this MR.

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good now and works as expected!

review: Approve

[lp:~tiagosh/telephony-service/fix-attachment-size]

841. By Tiago Salem Herrmann on 2014-07-09

merge trunk

=== modified file 'handler/texthandler.cpp'
--- handler/texthandler.cpp	2014-06-25 12:19:20 +0000
+++ handler/texthandler.cpp	2014-07-09 13:50:35 +0000
@@ -25,6 +25,7 @@
 #include "config.h"
 #include "dbustypes.h"
 
+#include <QImage>
 #include <TelepathyQt/ContactManager>
 #include <TelepathyQt/PendingContacts>
 
@@ -130,6 +131,7 @@
     header["message-type"] = QDBusVariant(0);
     message << header;
     Q_FOREACH(const AttachmentStruct &attachment, attachments) {
+        QByteArray fileData;
         QString newFilePath = QString(attachment.filePath).replace("file://", "");
         QFile attachmentFile(newFilePath);
         if (!attachmentFile.open(QIODevice::ReadOnly)) {
@@ -139,14 +141,27 @@
         if (attachment.contentType.startsWith("image/")) {
             regions += QString(SMIL_IMAGE_REGION).arg(attachment.id);
             parts += QString(SMIL_IMAGE_PART).arg(QFileInfo(attachmentFile.fileName()).fileName()).arg(attachment.id);
+            // check if we need to reduce de image size in case it's bigger than 300k
+            if (attachmentFile.size() > 307200) {
+                QImage scaledImage(newFilePath);
+                if (!scaledImage.isNull()) {
+                    QBuffer buffer(&fileData);
+                    buffer.open(QIODevice::WriteOnly);
+                    scaledImage.scaled(640, 640, Qt::KeepAspectRatio).save(&buffer, "jpg");
+                } else {
+                    fileData = attachmentFile.readAll();
+                }
+            } else {
+                fileData = attachmentFile.readAll();
+            }
         } else if (attachment.contentType.startsWith("text/")) {
             regions += QString(SMIL_TEXT_REGION).arg(attachment.id);
             parts += QString(SMIL_TEXT_PART).arg(QFileInfo(attachmentFile.fileName()).fileName()).arg(attachment.id);
+            fileData = attachmentFile.readAll();
         } else {
             continue;
         }
 
-        QByteArray fileData = attachmentFile.readAll();
         Tp::MessagePart part;
         part["content-type"] =  QDBusVariant(attachment.contentType);
         part["identifier"] = QDBusVariant(attachment.id);