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

[Arthur Mello]

Use a Loader for OrganicMediaLst delegates to avoid crashes when loading multiple files

[Gustavo Pichorim Boiko (boiko)]

Just one remark, but other than that the code looks good

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1225
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1162/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/90
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/90
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/90/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/90
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/242
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/894
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/691
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22098

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1225
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1162/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/90
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/90
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/90/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/90
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/242
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/894
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/691
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22098

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1226
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1163/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/91
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/91
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/91/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/91
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/243
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/895
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/692
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22100

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1226
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1163/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/91
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/91
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/91/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/91
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/243
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/895
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/692
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22100

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1227
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1164/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/92
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/92/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/896
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/695
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22118

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1227
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1164/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/92
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/92/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/896
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/695
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22118

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1226
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1165/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/93
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/93
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/93/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/93
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/245
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/897
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/696
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22121

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1228
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1166/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/94
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/94
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/94/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/94
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/246
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/898
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/697
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22125

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1228
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1166/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/94
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/94
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/94/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/94
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/246
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/898
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/697
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22125

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1230
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1171/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/99
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/99
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/99/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/99
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/252
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/904
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/704
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22264

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1231
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1172/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/100
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/100/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/253
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/905
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/705
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22282

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1231
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1172/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/100
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/100/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/253
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/905
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/705
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22282

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

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1234
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1178/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/106
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/106/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/106
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/259/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/911/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/725
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22654

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1235
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1189/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/117
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/117
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/117/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/117
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/270
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/921
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/743
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22931

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

review: Needs Fixing (continuous-integration)

[lp:~artmello/gallery-app/gallery-app-fix_crash_adding_files]

1234. By Launchpad Translations on behalf of phablet-team on 2015-09-05

Launchpad automatic translations update.

1235. By Launchpad Translations on behalf of phablet-team on 2015-09-07

Launchpad automatic translations update.

1236. By Arthur Mello on 2015-09-23

Do not ignore file if gallery is not able to read its metadata.
Add libqt5svg5 as build dep to run unittests. Fixes: #1452572, #1470638
Approved by: Ugo Riboni

1237. By Arthur Mello on 2015-09-23

Request only one thumbnail to be displayed at SingleMediaViewer to avoid reloading at fullscreen toggle Fixes: #1494383
Approved by: Florian Boucault

1238. By CI Train Bot Account on 2015-09-23

Releasing 0.0.67+15.10.20150923-0ubuntu1

1239. By Launchpad Translations on behalf of phablet-team on 2015-09-28

Launchpad automatic translations update.

1240. By Launchpad Translations on behalf of phablet-team on 2015-09-29

Launchpad automatic translations update.

1241. By Launchpad Translations on behalf of phablet-team on 2015-10-04

Launchpad automatic translations update.

1242. By Launchpad Translations on behalf of phablet-team on 2015-11-01

Launchpad automatic translations update.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1236
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1200/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/128
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/128/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/128
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/298
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/955
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/784
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24953

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

review: Needs Fixing (continuous-integration)

[lp:~artmello/gallery-app/gallery-app-fix_crash_adding_files]

1243. By Arthur Mello on 2015-11-06

Update QML code to work with Ubuntu.Components 1.3 Fixes: #1508363
Approved by: Renato Araujo Oliveira Filho

1244. By Arthur Mello on 2015-11-06

Use a Loader for OrganicMediaLst delegates to avoid crashes when loading multiple files Fixes: #1470109, #1475210
Approved by: Gustavo Pichorim Boiko

=== modified file 'rc/qml/Components/MediaSelector.qml'
--- rc/qml/Components/MediaSelector.qml	2014-08-27 02:20:58 +0000
+++ rc/qml/Components/MediaSelector.qml	2015-11-05 12:35:25 +0000
@@ -69,6 +69,7 @@
     }
 
     delegate: OrganicMediaList {
+        objectName: "mediaSelectorList" + index
         width: mediaSelector.width
         event: model.event
         selection: mediaSelector.selection

=== modified file 'rc/qml/OrganicView/OrganicMediaList.qml'
--- rc/qml/OrganicView/OrganicMediaList.qml	2015-07-27 22:48:49 +0000
+++ rc/qml/OrganicView/OrganicMediaList.qml	2015-11-05 12:35:25 +0000
@@ -124,7 +124,10 @@
         id: thumbnailDelegate
         Item {
             objectName: "eventPhoto"
+            property variant model
+            property int index: 0
             property int patternPhoto: index % __mediaPerPattern
+            property alias thumbnailLoaded: thumbnail.visible
 
             width: __photoWidth[patternPhoto]
             height: __photoSize[patternPhoto]
@@ -185,7 +188,7 @@
                 }
 
                 Connections {
-                    target: model.mediaSource
+                    target: model && model.mediaSource ? model.mediaSource : null
                     onDataChanged: {
                         // data changed but filename didn't, so we need to bypass the qml image
                         // cache by tacking a timestamp to the filename so sees it as different.
@@ -197,7 +200,7 @@
                     // Display a play icon if the thumbnail is from a video
                     source: "../../img/icon_play.png"
                     anchors.centerIn: parent
-                    visible: mediaSource.type === MediaSource.Video
+                    visible: model.mediaSource.type === MediaSource.Video
                 }
 
                 OrganicItemInteraction {
@@ -259,7 +262,7 @@
 
         maximumFlickVelocity: units.gu(300)
         flickDeceleration: maximumFlickVelocity / 3
-        cacheBuffer: 0
+        cacheBuffer: width
 
         model: MediaCollectionModel {
             id: mediaModel
@@ -271,7 +274,31 @@
 
         header: eventHeader
         spacing: __margin
-        delegate: thumbnailDelegate
+        delegate: Loader {
+            id: thumbnailLoader
+            objectName: "thumbnailLoader" + index
+
+            property int patternPhoto: index % __mediaPerPattern
+
+            sourceComponent: eventView.header.status == Component.Ready ? thumbnailDelegate : undefined
+            asynchronous: true
+
+            width: __photoWidth[patternPhoto]
+            height: __photoSize[patternPhoto]
+
+            Binding {
+                target: thumbnailLoader.item
+                property: "model"
+                value: model
+                when: thumbnailLoader.status == Loader.Ready
+            }
+            Binding {
+                target: thumbnailLoader.item
+                property: "index"
+                value: index
+                when: thumbnailLoader.status == Loader.Ready
+            }
+        }
         footer: Item {
             width: eventView.rightBuffer +
                    __footerWidth[mediaModel.count % __mediaPerPattern] +

=== modified file 'src/media/media-collection.cpp'
--- src/media/media-collection.cpp	2015-01-26 16:43:17 +0000
+++ src/media/media-collection.cpp	2015-11-05 12:35:25 +0000
@@ -57,7 +57,7 @@
     const QDateTime &exptime_b = qobject_cast<MediaSource*>(b)->exposureDateTime();
 
     return (exptime_a == exptime_b) ?
-                (DataCollection::defaultDataObjectComparator(a, b)) :
+                (!DataCollection::defaultDataObjectComparator(a, b)) :
                 (exptime_a < exptime_b);
 }
 

=== modified file 'tests/autopilot/gallery_app/emulators/media_selector.py'
--- tests/autopilot/gallery_app/emulators/media_selector.py	2014-04-30 23:28:14 +0000
+++ tests/autopilot/gallery_app/emulators/media_selector.py	2015-11-05 12:35:25 +0000
@@ -21,10 +21,16 @@
     def get_second_photo(self):
         """Return the second photo item"""
         selector = self.get_media_selector()
-        medias = selector.select_many("OrganicItemInteraction",
-                                      objectName="eventsViewPhoto")
-        # needs fixing: can't rely no list ordering lp:1247711
-        return medias[0]
+
+        # get the first row in the selector
+        mediaRow = selector.wait_select_single(objectName="mediaSelectorList0")
+
+        # get the loader for the second item
+        thumbnailLoader = mediaRow.wait_select_single(objectName="thumbnailLoader1")
+
+        # return the item itself
+        return thumbnailLoader.wait_select_single(objectName="eventPhoto",
+                                                  thumbnailLoaded=True)
 
     def ensure_fully_open(self):
         """Ensure media selector is fully open"""