Merge lp:~artmello/gallery-app/gallery-app-fix_1536168 into lp:gallery-app

[Arthur Mello]

Check MimeType to verify if it's an image format before adding to gallery's collection

Check MimeType to verify if it's an image format before adding to gallery's collection

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1303
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1244/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/172
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/172
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/172/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/172
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/442/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1111/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/1050
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28073

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1244/rebuild

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

code looks good.

review: Approve

=== modified file 'rc/qml/MediaViewer/SingleMediaViewer.qml'
--- rc/qml/MediaViewer/SingleMediaViewer.qml	2016-02-25 18:01:15 +0000
+++ rc/qml/MediaViewer/SingleMediaViewer.qml	2016-04-12 12:23:56 +0000
@@ -240,6 +240,7 @@
                         horizontalAlignment: Text.AlignHCenter
                         text: i18n.tr("An error has occurred attempting to load media")
                         fontSize: "large"
+                        color: "lightgrey"
                     }
                 }
             }
 
=== modified file 'src/photo/photo.cpp'
--- src/photo/photo.cpp	2015-11-04 19:33:54 +0000
+++ src/photo/photo.cpp	2016-04-12 12:23:56 +0000
@@ -52,6 +52,12 @@
  */
 bool Photo::isValid(const QFileInfo& file)
 {
+    QMimeDatabase mimedb;
+    QMimeType mimeType = mimedb.mimeTypeForFile(file);
+    if (!mimeType.name().contains("image")) {
+        return false;
+    }
+
     QImageReader reader(file.filePath());
     QByteArray format = reader.format();