Merge lp:~libqtelegram-team/telegram-app/android-images-not-shown-in-secret-chats into lp:telegram-app/dev

[Roberto Mier Escandon]

Scaled image to have a max of 4096 in width or heigth, maintaining the aspect ratio, for secret chats.

This prevents blank screen on Android devices when shown preview

[lp:~libqtelegram-team/telegram-app/android-images-not-shown-in-secret-chats]

169. By Roberto Mier Escandon on 2015-02-09

limitted image width or height to 2048

[Michał Karnicki (karni)]

review: Needs Information

[lp:~libqtelegram-team/telegram-app/android-images-not-shown-in-secret-chats]

170. By Roberto Mier Escandon on 2015-02-11

set default width and height for photo set to 0 in case of photos to be sent to secret chats

[Roberto Mier Escandon (rmescandon)]

answered

[Michał Karnicki (karni)]

+1 once tested with 1 portrait and 1 landscape picture to iOS

=== modified file 'lib/CMakeLists.txt'
--- lib/CMakeLists.txt	2015-01-30 08:20:13 +0000
+++ lib/CMakeLists.txt	2015-02-11 12:02:02 +0000
@@ -33,7 +33,7 @@
     secret/decryptedmessagebuilder.cpp)
 set_property(TARGET ${LIB_NAME} PROPERTY COMPILE_FLAGS "${COMPILE_FLAGS} -fpermissive")
 set_target_properties(${LIB_NAME} PROPERTIES VERSION ${VERSION} SOVERSION 1)
-qt5_use_modules(${LIB_NAME} Network)
+qt5_use_modules(${LIB_NAME} Network Multimedia)
 target_link_libraries(${LIB_NAME} ${OPENSSL_LDFLAGS})
 
 if (IS_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
 
=== modified file 'lib/secret/decryptedmessagebuilder.cpp'
--- lib/secret/decryptedmessagebuilder.cpp	2015-02-03 17:18:25 +0000
+++ lib/secret/decryptedmessagebuilder.cpp	2015-02-11 12:02:02 +0000
@@ -66,8 +66,8 @@
 }
 
 DecryptedMessage DecryptedMessageBuilder::buildDecryptedMessageForSendPhoto(qint64 randomId, qint32 ttl, const QByteArray &key, const QByteArray &iv, qint32 size,
-                                                        const QByteArray &thumb, qint32 thumbW, qint32 thumbH,
-                                                        qint32 width, qint32 height) {
+                                                                            qint32 width, qint32 height,
+                                                                            const QByteArray &thumb, qint32 thumbW, qint32 thumbH) {
 
     DecryptedMessageMedia media(DecryptedMessageMedia::typeDecryptedMessageMediaPhoto);
     media.setThumb(thumb);
 
=== modified file 'lib/secret/decryptedmessagebuilder.h'
--- lib/secret/decryptedmessagebuilder.h	2015-02-03 17:18:25 +0000
+++ lib/secret/decryptedmessagebuilder.h	2015-02-11 12:02:02 +0000
@@ -17,12 +17,12 @@
     DecryptedMessage buildDecryptedMessageForTtl(qint64 randomId, qint32 ttl);
     DecryptedMessage buildDecryptedMessageForResend(qint64 randomId, qint32 startSeqNo, qint32 endSeqNo);
     DecryptedMessage buildDecryptedMessageForSendPhoto(qint64 randomId, qint32 ttl, const QByteArray &key, const QByteArray &iv, qint32 size = 0,
-                                                 const QByteArray &thumb = QByteArray(), qint32 thumbW = 90, qint32 thumbH = 90,
-                                                 qint32 width = 100, qint32 height = 100);
+                                                       qint32 width = 0, qint32 height = 0,
+                                                       const QByteArray &thumb = QByteArray(), qint32 thumbW = 90, qint32 thumbH = 90);
     DecryptedMessage buildDecryptedMessageForSendVideo(qint64 randomId, qint32 ttl, const QByteArray &key, const QByteArray &iv, qint32 size = 0,
-                                                 const QString &mimeType = QString(),
-                                                 qint32 duration = 0,  qint32 width = 0, qint32 height = 0,
-                                                 const QByteArray &thumb = QByteArray(), qint32 thumbW = 90, qint32 thumbH = 90);
+                                                       const QString &mimeType = QString(),
+                                                       qint32 duration = 0,  qint32 width = 0, qint32 height = 0,
+                                                       const QByteArray &thumb = QByteArray(), qint32 thumbW = 90, qint32 thumbH = 90);
 
 private:
     qint32 mLayer;
 
=== modified file 'lib/telegram.cpp'
--- lib/telegram.cpp	2015-02-04 15:57:51 +0000
+++ lib/telegram.cpp	2015-02-11 12:02:02 +0000
@@ -33,6 +33,7 @@
 #include <QFileInfo>
 #include <QMimeDatabase>
 #include <QtEndian>
+#include <QImage>
 
 #include "core/tlvalues.h"
 
@@ -422,8 +423,13 @@
     QFileInfo fileInfo(filePath);
     qint32 size = fileInfo.size();
 
+    QImage image;
+    image.load(filePath);
+    qint32 width = image.width();
+    qint32 height = image.height();
+
     DecryptedMessageBuilder builder(secretChat->layer());
-    DecryptedMessage decryptedMessage = builder.buildDecryptedMessageForSendPhoto(randomId, ttl, key, iv, size);
+    DecryptedMessage decryptedMessage = builder.buildDecryptedMessageForSendPhoto(randomId, ttl, key, iv, size, width, height);
     op->setDecryptedMessage(decryptedMessage);
 
     return uploadSendFile(*op, filePath);
 
=== modified file 'qmlplugin/CMakeLists.txt'
--- qmlplugin/CMakeLists.txt	2015-02-03 08:56:27 +0000
+++ qmlplugin/CMakeLists.txt	2015-02-11 12:02:02 +0000
@@ -1,4 +1,5 @@
 find_package(Qt5Network REQUIRED)
+find_package(Qt5Multimedia REQUIRED)
 pkg_check_modules(SQLITE3 REQUIRED sqlite3)
 pkg_check_modules(THUMBNAILER thumbnailer REQUIRED)
 pkg_check_modules(MEDIAINFO libmediainfo REQUIRED)
@@ -129,7 +130,7 @@
 string(REGEX REPLACE "\\." "/" MODULE_OUTPUT_DIR ${MODULE_NAME})
 
 set_target_properties(${QMLPLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${MODULE_OUTPUT_DIR})
-qt5_use_modules(${QMLPLUGIN_NAME} Gui Qml Quick Sql)
+qt5_use_modules(${QMLPLUGIN_NAME} Gui Qml Quick Sql Multimedia)
 
 # Create qmldir content
 file(WRITE qmldir "module " ${MODULE_NAME}\n)
 
=== modified file 'qmlplugin/config.h'
--- qmlplugin/config.h	2014-10-31 08:50:53 +0000
+++ qmlplugin/config.h	2015-02-11 12:02:02 +0000
@@ -22,6 +22,7 @@
 #define PHOTOS_MEDIA_FOLDER "photos"
 #define VIDEOS_MEDIA_FOLDER "videos"
 #define OUTGOING_MEDIA_FOLDER "outgoing"
+#define PHOTO_MAX_DIMENSION 2048
 
 #include <QString>
 #include <QLoggingCategory>
 
=== modified file 'qmlplugin/telegramservice.cpp'
--- qmlplugin/telegramservice.cpp	2015-02-04 21:41:51 +0000
+++ qmlplugin/telegramservice.cpp	2015-02-11 12:02:02 +0000
@@ -669,6 +669,9 @@
         return -1;
     }
 
+    // Android secret chat only previews photos with max size 4096x4096
+    Tools::resizePhotoIfNeeded(photoLocalPath);
+
     qint64 randomId = Tools::generateRandomId();
     qint64 requestId = mTelegramLib->messagesSendEncryptedPhoto(chatId, randomId, ttl, photoLocalPath);
     DecryptedMessage message;
 
=== modified file 'qmlplugin/tools.cpp'
--- qmlplugin/tools.cpp	2015-02-03 08:56:27 +0000
+++ qmlplugin/tools.cpp	2015-02-11 12:02:02 +0000
@@ -19,6 +19,7 @@
  */
 #include "tools.h"
 #include "core/utils.h"
+#include "config.h"
 #include <iostream>
 #include <stdexcept>
 #include <QMimeDatabase>
@@ -209,4 +210,23 @@
     return jpegFile;
 }
 
-
+void Tools::resizePhotoIfNeeded(const QString &photoFilePath) {
+    QImage image;
+    image.load(photoFilePath);
+    qint32 originalWidth = image.width();
+    qint32 originalHeight = image.height();
+
+    qint32 max = originalWidth > originalHeight ? originalWidth : originalHeight;
+
+    if (max > PHOTO_MAX_DIMENSION) {
+        QImage small;
+        if (originalWidth == max) {
+            small = image.scaled(PHOTO_MAX_DIMENSION, originalHeight, Qt::KeepAspectRatio);
+        } else if (originalHeight == max) {
+            small = image.scaled(originalWidth, PHOTO_MAX_DIMENSION, Qt::KeepAspectRatio);
+        }
+        qCDebug(TG_PLUGIN_LOGIC) << "original size " << originalWidth << "x" << originalHeight << "reduced to"
+                                    << small.width() << "x" << small.height();
+        small.save(photoFilePath);
+    }
+}
 
=== modified file 'qmlplugin/tools.h'
--- qmlplugin/tools.h	2015-02-03 08:56:27 +0000
+++ qmlplugin/tools.h	2015-02-11 12:02:02 +0000
@@ -44,6 +44,7 @@
     static MessageMedia::MessageMediaType toMessageMediaType(DecryptedMessageMedia::DecryptedMessageMediaType decryptedMessageMediaType);
     static qint32 getBelongingDialogId(const Message &message);
     static QString pngToJpeg(const QString &pngFile, qint32 quality = -1);
+    static void resizePhotoIfNeeded(const QString &photoFilePath);
 };
 
 #endif // TOOLS_H